diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-04-17 22:54:26 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-04-17 22:54:26 +0300 |
| commit | 59d7fbb052bcb7949420fb9ad694d8e69992c846 (patch) | |
| tree | 1d19038541500712edc342e2db90ace2f6e1d62f /source/blender/gpu | |
| parent | f2acfb460f991924917113ca085e0dd9b0babed7 (diff) | |
| parent | 156319d2b30c222728e22e361cd75b1bd68345f0 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_texture.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c index 075a8e8aeb5..6d2d0f09a42 100644 --- a/source/blender/gpu/intern/gpu_texture.c +++ b/source/blender/gpu/intern/gpu_texture.c @@ -165,26 +165,33 @@ static const char *gl_enum_to_str(GLenum e) ENUM_TO_STRING(TEXTURE_2D_MULTISAMPLE), ENUM_TO_STRING(RGBA32F), ENUM_TO_STRING(RGBA16F), + ENUM_TO_STRING(RGBA16UI), + ENUM_TO_STRING(RGBA16I), ENUM_TO_STRING(RGBA16), - ENUM_TO_STRING(RG32F), + ENUM_TO_STRING(RGBA8UI), + ENUM_TO_STRING(RGBA8I), + ENUM_TO_STRING(RGBA8), ENUM_TO_STRING(RGB16F), + ENUM_TO_STRING(RG32F), ENUM_TO_STRING(RG16F), + ENUM_TO_STRING(RG16UI), ENUM_TO_STRING(RG16I), ENUM_TO_STRING(RG16), - ENUM_TO_STRING(RGBA8), - ENUM_TO_STRING(RGBA8UI), + ENUM_TO_STRING(RG8UI), + ENUM_TO_STRING(RG8I), + ENUM_TO_STRING(RG8), + ENUM_TO_STRING(R8UI), + ENUM_TO_STRING(R8I), + ENUM_TO_STRING(R8), ENUM_TO_STRING(R32F), ENUM_TO_STRING(R32UI), ENUM_TO_STRING(R32I), ENUM_TO_STRING(R16F), - ENUM_TO_STRING(R16I), ENUM_TO_STRING(R16UI), - ENUM_TO_STRING(RG8), - ENUM_TO_STRING(RG16UI), + ENUM_TO_STRING(R16I), ENUM_TO_STRING(R16), - ENUM_TO_STRING(R8), - ENUM_TO_STRING(R8UI), ENUM_TO_STRING(R11F_G11F_B10F), + ENUM_TO_STRING(SRGB8_ALPHA8), ENUM_TO_STRING(DEPTH24_STENCIL8), ENUM_TO_STRING(DEPTH32F_STENCIL8), ENUM_TO_STRING(DEPTH_COMPONENT32F), @@ -457,7 +464,7 @@ static GLenum gpu_format_to_gl_internalformat(eGPUTextureFormat format) case GPU_RG16I: return GL_RG16I; case GPU_RG16F: - return GL_RGBA32F; + return GL_RG16F; case GPU_RG16: return GL_RG16; case GPU_R8UI: |