Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2018-05-15 16:19:57 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-05-15 16:40:12 +0300
commit197af58baab1c1be7e6f371a829b31f5c1098a73 (patch)
tree34a454ee49cfa782178ff06095154599b3732002 /source/blender/gpu/intern/gpu_texture.c
parent4d5b7696cbf8b4452dbc04200cb7cd188373f19a (diff)
Workbench: Cleaner Shadow edges own shadow
Diffstat (limited to 'source/blender/gpu/intern/gpu_texture.c')
-rw-r--r--source/blender/gpu/intern/gpu_texture.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index 3961278ad1a..5c8edfb2a33 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -149,8 +149,8 @@ static GLenum gpu_texture_get_format(
}
else {
/* Integer formats */
- if (ELEM(data_type, GPU_RG16I, GPU_R16I, GPU_R16UI, GPU_R32UI)) {
- if (ELEM(data_type, GPU_R16UI, GPU_R32UI)) {
+ if (ELEM(data_type, GPU_RG16I, GPU_R16I, GPU_RG16UI, GPU_R16UI, GPU_R32UI)) {
+ if (ELEM(data_type, GPU_R16UI, GPU_RG16UI, GPU_R32UI)) {
*data_format = GL_UNSIGNED_INT;
}
else {
@@ -194,6 +194,7 @@ static GLenum gpu_texture_get_format(
break;
case GPU_RG16F:
case GPU_RG16I:
+ case GPU_RG16UI:
case GPU_RG16:
case GPU_DEPTH24_STENCIL8:
case GPU_DEPTH_COMPONENT32F:
@@ -238,6 +239,7 @@ static GLenum gpu_texture_get_format(
case GPU_R16I: return GL_R16I;
case GPU_R16UI: return GL_R16UI;
case GPU_RG8: return GL_RG8;
+ case GPU_RG16UI: return GL_RG16UI;
case GPU_R8: return GL_R8;
/* Special formats texture & renderbuffer */
case GPU_R11F_G11F_B10F: return GL_R11F_G11F_B10F;
@@ -270,6 +272,7 @@ static int gpu_texture_get_component_count(GPUTextureFormat format)
case GPU_RG16:
case GPU_RG16F:
case GPU_RG16I:
+ case GPU_RG16UI:
case GPU_RG32F:
return 2;
default: