diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-01-16 06:41:27 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-01-17 21:44:01 +0300 |
| commit | 4c9589909807f346e23966379f240dd57d057a1d (patch) | |
| tree | 40bad4807d5b5cdd5e632f00562477bf7bb7754c /source/blender/gpu/intern/gpu_batch.c | |
| parent | 938b08b33654f6bc3419519fc364021115d19dba (diff) | |
GPU: Rename GPU_shader_get_uniform to GPU_shader_get_uniform_ensure
This is in order to make the API more multithread friendly inside the
draw manager.
GPU_shader_get_uniform will only serve to query the shader interface and
not do any GL call, making it threadsafe.
For now it only print a warning if the uniform was not queried before.
Diffstat (limited to 'source/blender/gpu/intern/gpu_batch.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_batch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c index a2184df229f..30d38eb60fb 100644 --- a/source/blender/gpu/intern/gpu_batch.c +++ b/source/blender/gpu/intern/gpu_batch.c @@ -428,9 +428,9 @@ void GPU_batch_program_use_end(GPUBatch *batch) } #if TRUST_NO_ONE -# define GET_UNIFORM const GPUShaderInput *uniform = GPU_shaderinterface_uniform(batch->interface, name); assert(uniform); +# define GET_UNIFORM const GPUShaderInput *uniform = GPU_shaderinterface_uniform_ensure(batch->interface, name); assert(uniform); #else -# define GET_UNIFORM const GPUShaderInput *uniform = GPU_shaderinterface_uniform(batch->interface, name); +# define GET_UNIFORM const GPUShaderInput *uniform = GPU_shaderinterface_uniform_ensure(batch->interface, name); #endif void GPU_batch_uniform_1ui(GPUBatch *batch, const char *name, int value) |