diff options
| author | Anuj Phogat <[email protected]> | 2014-10-01 15:24:27 -0700 |
|---|---|---|
| committer | Anuj Phogat <[email protected]> | 2014-10-01 15:27:31 -0700 |
| commit | 25266b2c1185874494309ed4962ffd51350f7ba2 (patch) | |
| tree | 80da50da83b9866d724298b2a2710ee39d2bca90 /src/mesa/drivers/common/meta_blit.c | |
| parent | 44b500f5f2671f2a9d82f601a2bf4329b6c9a8e6 (diff) | |
meta: Fix make check failures in setup_glsl_msaa_blit_scaled_shader()
introduced by commit 68ee950.
Signed-off-by: Anuj Phogat <[email protected]>
Reported-by: Mark Janes <[email protected]>
Diffstat (limited to 'src/mesa/drivers/common/meta_blit.c')
| -rw-r--r-- | src/mesa/drivers/common/meta_blit.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c index 4d32c0e96f8..c6616d93d3c 100644 --- a/src/mesa/drivers/common/meta_blit.c +++ b/src/mesa/drivers/common/meta_blit.c @@ -45,6 +45,7 @@ #include "main/texenv.h" #include "main/teximage.h" #include "main/texparam.h" +#include "main/uniforms.h" #include "main/varray.h" #include "main/viewport.h" #include "swrast/swrast.h" @@ -105,11 +106,11 @@ setup_glsl_msaa_blit_scaled_shader(struct gl_context *ctx, _mesa_UseProgram(blit->msaa_shaders[shader_index]); /* Update the uniform values. */ loc_src_width = - glGetUniformLocation(blit->msaa_shaders[shader_index], "src_width"); + _mesa_GetUniformLocation(blit->msaa_shaders[shader_index], "src_width"); loc_src_height = - glGetUniformLocation(blit->msaa_shaders[shader_index], "src_height"); - glUniform1f(loc_src_width, src_rb->Width); - glUniform1f(loc_src_height, src_rb->Height); + _mesa_GetUniformLocation(blit->msaa_shaders[shader_index], "src_height"); + _mesa_Uniform1f(loc_src_width, src_rb->Width); + _mesa_Uniform1f(loc_src_height, src_rb->Height); return; } @@ -218,11 +219,11 @@ setup_glsl_msaa_blit_scaled_shader(struct gl_context *ctx, _mesa_meta_compile_and_link_program(ctx, vs_source, fs_source, name, &blit->msaa_shaders[shader_index]); loc_src_width = - glGetUniformLocation(blit->msaa_shaders[shader_index], "src_width"); + _mesa_GetUniformLocation(blit->msaa_shaders[shader_index], "src_width"); loc_src_height = - glGetUniformLocation(blit->msaa_shaders[shader_index], "src_height"); - glUniform1f(loc_src_width, src_rb->Width); - glUniform1f(loc_src_height, src_rb->Height); + _mesa_GetUniformLocation(blit->msaa_shaders[shader_index], "src_height"); + _mesa_Uniform1f(loc_src_width, src_rb->Width); + _mesa_Uniform1f(loc_src_height, src_rb->Height); ralloc_free(mem_ctx); } |