archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

plug ShaderInterface into GPUShader

Browse Source 
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.
This commit is contained in:
Mike Erwin
2017-03-02 21:46:54 -05:00
parent c2baf3e486
commit 8cf524cec9
4 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/gpu/GPU_shader.h
View File

@@ -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,