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:
authorClément Foucault <foucault.clem@gmail.com>2018-03-14 00:36:24 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-03-14 14:41:00 +0300
commitf7f3b08977490e5ed2da93e46a1fce90a0630cff (patch)
treedd7e9b7c53ab47589294bb72251148991c8a8075 /source/blender/draw
parente7c3c46e8902a214c12f2cba70790646a6fcfda6 (diff)
GPUTexture: Unlock GL_R16I format.
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/intern/DRW_render.h1
-rw-r--r--source/blender/draw/intern/draw_manager_texture.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 937e88051c2..33b89bb8024 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -182,6 +182,7 @@ typedef enum {
DRW_TEX_RG_32,
DRW_TEX_R_8,
DRW_TEX_R_16,
+ DRW_TEX_R_16I,
DRW_TEX_R_32,
DRW_TEX_DEPTH_16,
DRW_TEX_DEPTH_24,
diff --git a/source/blender/draw/intern/draw_manager_texture.c b/source/blender/draw/intern/draw_manager_texture.c
index bbef680e77a..e033a0c506e 100644
--- a/source/blender/draw/intern/draw_manager_texture.c
+++ b/source/blender/draw/intern/draw_manager_texture.c
@@ -35,6 +35,7 @@ void drw_texture_get_format(
/* Only add formats that are COMPATIBLE with FB.
* Generally they are multiple of 16bit. */
case DRW_TEX_R_16:
+ case DRW_TEX_R_16I:
case DRW_TEX_R_32:
case DRW_TEX_RG_8:
case DRW_TEX_RG_16:
@@ -70,6 +71,7 @@ void drw_texture_get_format(
case DRW_TEX_RG_32: *r_data_type = GPU_RG32F; break;
case DRW_TEX_R_8: *r_data_type = GPU_R8; break;
case DRW_TEX_R_16: *r_data_type = GPU_R16F; break;
+ case DRW_TEX_R_16I: *r_data_type = GPU_R16I; break;
case DRW_TEX_R_32: *r_data_type = GPU_R32F; break;
#if 0
case DRW_TEX_RGB_8: *r_data_type = GPU_RGB8; break;