diff options
author | Mike Erwin <significant.bit@gmail.com> | 2017-03-03 05:46:54 +0300 |
---|---|---|
committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-03 05:46:54 +0300 |
commit | 8cf524cec9434cb2aa4b94ee29fd0a57dc502a33 (patch) | |
tree | a5eb2c7178e3985f92221eb70f22bcdb5b1ea9db /source/blender/gpu/GPU_shader.h | |
parent | c2baf3e486021c048c87eea66e3183966ff86d2f (diff) |
plug ShaderInterface into GPUShader
Renamed existing getter/setter that only FX shaders use. We could convert FX code to use the richer new interface or leave it as is.
Removed unused GPUShader fields. ShaderInterface tracks the same information.
Diffstat (limited to 'source/blender/gpu/GPU_shader.h')
-rw-r--r-- | source/blender/gpu/GPU_shader.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index fe29b1edc58..31b066e7e8e 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -71,8 +71,12 @@ void GPU_shader_bind(GPUShader *shader); void GPU_shader_unbind(void); int GPU_shader_get_program(GPUShader *shader); + void *GPU_shader_get_interface(GPUShader *shader); -void GPU_shader_set_interface(GPUShader *shader, void *interface); + +void *GPU_fx_shader_get_interface(GPUShader *shader); +void GPU_fx_shader_set_interface(GPUShader *shader, void *interface); + int GPU_shader_get_uniform(GPUShader *shader, const char *name); int GPU_shader_get_uniform_block(GPUShader *shader, const char *name); void GPU_shader_uniform_vector(GPUShader *shader, int location, int length, |