From: Ian Romanick <ian.d.roman...@intel.com>
After the previous commit, the return type is not used.
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
---
src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
index de0db5d..a9fb43a 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
@@ -315,7 +315,7 @@ setup_coord_transform(const struct blit_dims *dims)
dims->mirror_y);
}
-static GLuint
+static void
setup_program(struct brw_context *brw, bool msaa_tex)
{
struct gl_context *ctx = &brw->ctx;
@@ -330,7 +330,7 @@ setup_program(struct brw_context *brw, bool msaa_tex)
if (*prog_id) {
_mesa_UseProgram(*prog_id);
- return *prog_id;
+ return;
}
fs_source = ralloc_asprintf(NULL, fs_tmpl, sampler->sampler,
@@ -339,7 +339,6 @@ setup_program(struct brw_context *brw, bool msaa_tex)
"i965 stencil blit",
prog_id);
ralloc_free(fs_source);
- return *prog_id;
}
/**
@@ -459,7 +458,7 @@ brw_meta_stencil_blit(struct brw_context *brw,
struct gl_context *ctx = &brw->ctx;
struct blit_dims dims = *orig_dims;
struct fb_tex_blit_state blit;
- GLuint prog, fbo;
+ GLuint fbo;
struct gl_renderbuffer *rb;
GLenum target;
@@ -490,7 +489,7 @@ brw_meta_stencil_blit(struct brw_context *brw,
_mesa_TexParameteri(target, GL_DEPTH_STENCIL_TEXTURE_MODE,
GL_STENCIL_INDEX);
- prog = setup_program(brw, target != GL_TEXTURE_2D);
+ setup_program(brw, target != GL_TEXTURE_2D);
setup_bounding_rect(orig_dims);
setup_drawing_rect(&dims);
setup_coord_transform(orig_dims);
--
2.5.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
