diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-03-25 20:24:19 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-03-25 21:06:12 +0300 |
| commit | 42b5328c36de93576c8225071909db82a0c823fe (patch) | |
| tree | 3a67dde689c21c2a371698099b8a155b63e7ed2d /source/blender/draw/intern | |
| parent | 94dd81941f17369a39ef8b6b74b4d8ed050153ed (diff) | |
DRW: Rename DRW_shgroup_uniform_buffer into DRW_shgroup_uniform_texture_ref
This is in order to not mix it with the incomming buffer textures.
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/DRW_render.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 4 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 5 |
4 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index e60ce6c391b..dc2e61b564b 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -362,7 +362,7 @@ void DRW_shgroup_uniform_texture(DRWShadingGroup *shgroup, const char *name, con void DRW_shgroup_uniform_texture_persistent(DRWShadingGroup *shgroup, const char *name, const struct GPUTexture *tex); void DRW_shgroup_uniform_block(DRWShadingGroup *shgroup, const char *name, const struct GPUUniformBuffer *ubo); void DRW_shgroup_uniform_block_persistent(DRWShadingGroup *shgroup, const char *name, const struct GPUUniformBuffer *ubo); -void DRW_shgroup_uniform_buffer(DRWShadingGroup *shgroup, const char *name, struct GPUTexture **tex); +void DRW_shgroup_uniform_texture_ref(DRWShadingGroup *shgroup, const char *name, struct GPUTexture **tex); void DRW_shgroup_uniform_float(DRWShadingGroup *shgroup, const char *name, const float *value, int arraysize); void DRW_shgroup_uniform_vec2(DRWShadingGroup *shgroup, const char *name, const float *value, int arraysize); void DRW_shgroup_uniform_vec3(DRWShadingGroup *shgroup, const char *name, const float *value, int arraysize); diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index c7e9b3dc08d..dd7e84f67d4 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -160,7 +160,7 @@ typedef enum { DRW_UNIFORM_FLOAT, DRW_UNIFORM_TEXTURE, DRW_UNIFORM_TEXTURE_PERSIST, - DRW_UNIFORM_BUFFER, + DRW_UNIFORM_TEXTURE_REF, DRW_UNIFORM_BLOCK, DRW_UNIFORM_BLOCK_PERSIST } DRWUniformType; diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 57b93741576..b09e45e90f7 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -146,9 +146,9 @@ void DRW_shgroup_uniform_block_persistent(DRWShadingGroup *shgroup, const char * drw_shgroup_uniform(shgroup, name, DRW_UNIFORM_BLOCK_PERSIST, ubo, 0, 1); } -void DRW_shgroup_uniform_buffer(DRWShadingGroup *shgroup, const char *name, GPUTexture **tex) +void DRW_shgroup_uniform_texture_ref(DRWShadingGroup *shgroup, const char *name, GPUTexture **tex) { - drw_shgroup_uniform(shgroup, name, DRW_UNIFORM_BUFFER, tex, 0, 1); + drw_shgroup_uniform(shgroup, name, DRW_UNIFORM_TEXTURE_REF, tex, 0, 1); } void DRW_shgroup_uniform_bool(DRWShadingGroup *shgroup, const char *name, const int *value, int arraysize) diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index dff0c175ad2..03db49bb4a7 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -844,10 +844,7 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) bind_texture(tex, BIND_PERSIST); GPU_shader_uniform_texture(shgroup->shader, uni->location, tex); break; - case DRW_UNIFORM_BUFFER: - if (!DRW_state_is_fbo()) { - break; - } + case DRW_UNIFORM_TEXTURE_REF: tex = *((GPUTexture **)uni->value); BLI_assert(tex); bind_texture(tex, BIND_TEMP); |