fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 22:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meta: Add rectangle textures to the shader-per-sampler-type table

Browse source 
Rectangle textures were not necessary for mipmap generation (because
they cannot have mipmaps), but all of the future users of this common
code will need to support rectangle textures.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Ian Romanick 2013-12-16 11:56:26 -08:00 • committed by Eric Anholt
parent f5a477ab76
commit 4825af972a
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -233,6 +233,7 @@ struct sampler_table {
struct glsl_sampler sampler_1d; struct glsl_sampler sampler_1d;
struct glsl_sampler sampler_2d; struct glsl_sampler sampler_2d;
struct glsl_sampler sampler_3d; struct glsl_sampler sampler_3d;
struct glsl_sampler sampler_rect;
struct glsl_sampler sampler_cubemap; struct glsl_sampler sampler_cubemap;
struct glsl_sampler sampler_1d_array; struct glsl_sampler sampler_1d_array;
struct glsl_sampler sampler_2d_array; struct glsl_sampler sampler_2d_array;
@ -3434,6 +3435,11 @@ setup_texture_sampler(GLenum target, struct sampler_table *table)
table->sampler_2d.func = "texture2D"; table->sampler_2d.func = "texture2D";
table->sampler_2d.texcoords = "texCoords.xy"; table->sampler_2d.texcoords = "texCoords.xy";
return &table->sampler_2d; return &table->sampler_2d;
case GL_TEXTURE_RECTANGLE:
table->sampler_rect.type = "sampler2DRect";
table->sampler_rect.func = "texture2DRect";
table->sampler_rect.texcoords = "texCoords.xy";
return &table->sampler_rect;
case GL_TEXTURE_3D: case GL_TEXTURE_3D:
/* Code for mipmap generation with 3D textures is not used yet. /* Code for mipmap generation with 3D textures is not used yet.
* It's a sw fallback. * It's a sw fallback.
@ -3470,6 +3476,7 @@ sampler_table_cleanup(struct sampler_table *table)
_mesa_DeleteObjectARB(table->sampler_1d.shader_prog); _mesa_DeleteObjectARB(table->sampler_1d.shader_prog);
_mesa_DeleteObjectARB(table->sampler_2d.shader_prog); _mesa_DeleteObjectARB(table->sampler_2d.shader_prog);
_mesa_DeleteObjectARB(table->sampler_3d.shader_prog); _mesa_DeleteObjectARB(table->sampler_3d.shader_prog);
_mesa_DeleteObjectARB(table->sampler_rect.shader_prog);
_mesa_DeleteObjectARB(table->sampler_cubemap.shader_prog); _mesa_DeleteObjectARB(table->sampler_cubemap.shader_prog);
_mesa_DeleteObjectARB(table->sampler_1d_array.shader_prog); _mesa_DeleteObjectARB(table->sampler_1d_array.shader_prog);
_mesa_DeleteObjectARB(table->sampler_2d_array.shader_prog); _mesa_DeleteObjectARB(table->sampler_2d_array.shader_prog);
@ -3477,6 +3484,7 @@ sampler_table_cleanup(struct sampler_table *table)
table->sampler_1d.shader_prog = 0; table->sampler_1d.shader_prog = 0;
table->sampler_2d.shader_prog = 0; table->sampler_2d.shader_prog = 0;
table->sampler_3d.shader_prog = 0; table->sampler_3d.shader_prog = 0;
table->sampler_rect.shader_prog = 0;
table->sampler_cubemap.shader_prog = 0; table->sampler_cubemap.shader_prog = 0;
table->sampler_1d_array.shader_prog = 0; table->sampler_1d_array.shader_prog = 0;
table->sampler_2d_array.shader_prog = 0; table->sampler_2d_array.shader_prog = 0;