AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meta: Fix make check failures in setup_glsl_msaa_blit_scaled_shader()

Browse Source 
introduced by commit 68ee950.

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reported-by: Mark Janes <mark.a.janes@intel.com>
This commit is contained in:
Anuj Phogat
2014-10-01 15:24:27 -07:00
parent 44b500f5f2
commit 25266b2c11
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/common/meta_blit.c
+9 -8
View File
@@ -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);
}