diff options
author | Mike Erwin <significant.bit@gmail.com> | 2016-10-18 07:08:34 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2016-10-18 07:08:34 +0300 |
commit | 70ff63e63fc3a63dccc6a6c567bbc347c64d6c7d (patch) | |
tree | 76934061ddae6dc4091541f5ee227bedc0346ad6 /source/blender/gpu/GPU_shader.h | |
parent | 0c6939f5f597e4e7fe5777de7a49b49ff53fa987 (diff) |
OpenGL: tweak image shaders & code that uses them
- rename image shaders to describe exactly what they do
- rename inputs to match other built-in shaders
- set & use active texture unit
- no need to enable/disable textures with GLSL
- pull vertex format setup out of loops
Diffstat (limited to 'source/blender/gpu/GPU_shader.h')
-rw-r--r-- | source/blender/gpu/GPU_shader.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index d52a0a2965d..1fe0f6f9717 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -101,9 +101,9 @@ typedef enum GPUBuiltinShader { GPU_SHADER_3D_FLAT_COLOR, GPU_SHADER_3D_SMOOTH_COLOR, GPU_SHADER_3D_DEPTH_ONLY, - /* basic 2D texture drawing */ - GPU_SHADER_2D_TEXTURE_2D, - GPU_SHADER_2D_TEXTURE_RECT, + /* basic image drawing */ + GPU_SHADER_3D_IMAGE_MODULATE_ALPHA, + GPU_SHADER_3D_IMAGE_RECT_MODULATE_ALPHA, /* points */ GPU_SHADER_2D_POINT_FIXED_SIZE_UNIFORM_COLOR, GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_SMOOTH, |