fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meta: Use common routine to configure fixed-function TNL state

Browse source 
Also... glOrtho(-1.0, 1.0, -1.0, 1.0, -1.0, 1.0) *is* the identity
matrix, so drop the unnecessary call to _mesa_Ortho.

v2: Rename setup_ff_TNL_for_blit() to setup_ff_tnl_for_blit().  Seems
    silly to capitalize one out of two to three acronyms in the name
    (change by anholt, acked by idr).

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com> (v1)
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Ian Romanick 2013-12-14 11:36:32 -08:00 • committed by Eric Anholt
parent 35e8de383c
commit 5e5d87ff32
1 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mesa/drivers/common/meta.c
View file

@ -1543,15 +1543,13 @@ init_blit_depth_pixels(struct gl_context *ctx)
}
static void
setup_ff_blit_framebuffer(struct blit_state *blit)
setup_ff_tnl_for_blit(GLuint *VAO, GLuint *VBO, unsigned texcoord_size)
{
setup_vertex_objects(&blit->VAO, &blit->VBO, false, 2, 2, 0);
setup_vertex_objects(VAO, VBO, false, 2, texcoord_size, 0);
/* setup projection matrix */
_mesa_MatrixMode(GL_PROJECTION);
_mesa_LoadIdentity();
_mesa_Ortho(-1.0, 1.0, -1.0, 1.0, -1.0, 1.0);
}
static void
@ -1723,7 +1721,9 @@ blitframebuffer_texture(struct gl_context *ctx,
_mesa_UseProgram(blit->RectShaderProg);
}
else {
setup_ff_blit_framebuffer(&ctx->Meta->Blit);
setup_ff_tnl_for_blit(&ctx->Meta->Blit.VAO,
&ctx->Meta->Blit.VBO,
2);
}
_mesa_GenSamplers(1, &sampler);
@ -1902,7 +1902,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
_mesa_UseProgram(blit->RectShaderProg);
}
else {
setup_ff_blit_framebuffer(blit);
setup_ff_tnl_for_blit(&blit->VAO, &blit->VBO, 2);
}
/* Silence valgrind warnings about reading uninitialized stack. */
@ -3346,19 +3346,6 @@ setup_texture_coords(GLenum faceTarget,
}
}
static void
setup_ff_generate_mipmap(struct gen_mipmap_state *mipmap)
{
setup_vertex_objects(&mipmap->VAO, &mipmap->VBO, false, 2, 3, 0);
/* setup projection matrix */
_mesa_MatrixMode(GL_PROJECTION);
_mesa_LoadIdentity();
_mesa_Ortho(-1.0, 1.0, -1.0, 1.0, -1.0, 1.0);
}
static struct glsl_sampler *
setup_texture_sampler(GLenum target, struct gen_mipmap_state *mipmap)
{
@ -3573,7 +3560,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
_mesa_UseProgram(mipmap->ShaderProg);
}
else {
setup_ff_generate_mipmap(mipmap);
setup_ff_tnl_for_blit(&mipmap->VAO, &mipmap->VBO, 3);
_mesa_set_enable(ctx, target, GL_TRUE);
}
@ -4004,7 +3991,7 @@ decompress_texture_image(struct gl_context *ctx,
decompress->Height = height;
}
setup_vertex_objects(&decompress->VAO, &decompress->VBO, false, 2, 3, 0);
setup_ff_tnl_for_blit(&decompress->VAO, &decompress->VBO, 3);
if (!decompress->Sampler) {
_mesa_GenSamplers(1, &decompress->Sampler);
@ -4041,8 +4028,6 @@ decompress_texture_image(struct gl_context *ctx,
verts[3].x = -1.0F;
verts[3].y = 1.0F;
_mesa_MatrixMode(GL_PROJECTION);
_mesa_LoadIdentity();
_mesa_set_viewport(ctx, 0, 0, 0, width, height);
/* upload new vertex data */