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

glsl: Add GLSL 1.40 textureSize() implementations for sampler2DRect.

Browse source 
By setting lod to 0 in the builtin function implementation, we avoid
needing to update all the visitors to ignore LOD in this case, when
the hardware drivers actually want to ask for LOD 0 for rectangular
textures.

Fixes piglit spec/GLSL-1.40/textureSize-*Rect.

v2: Change style of looking for substrings.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2012-03-12 14:07:39 -07:00
parent e06ab8c363
commit c0795742a3
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/glsl/builtins/profiles/140.frag
View file

@ -499,6 +499,11 @@ ivec3 textureSize(usampler2DArray sampler, int lod);
ivec2 textureSize(sampler1DArrayShadow sampler, int lod);
ivec3 textureSize(sampler2DArrayShadow sampler, int lod);
ivec2 textureSize(sampler2DRect sampler);
ivec2 textureSize(isampler2DRect sampler);
ivec2 textureSize(usampler2DRect sampler);
ivec2 textureSize(sampler2DRectShadow sampler);
/* texture - no bias */
vec4 texture( sampler1D sampler, float P);
ivec4 texture(isampler1D sampler, float P);

5
src/glsl/builtins/profiles/140.vert
View file

@ -499,6 +499,11 @@ ivec3 textureSize(usampler2DArray sampler, int lod);
ivec2 textureSize(sampler1DArrayShadow sampler, int lod);
ivec3 textureSize(sampler2DArrayShadow sampler, int lod);
ivec2 textureSize(sampler2DRect sampler);
ivec2 textureSize(isampler2DRect sampler);
ivec2 textureSize(usampler2DRect sampler);
ivec2 textureSize(sampler2DRectShadow sampler);
/* texture */
vec4 texture( sampler1D sampler, float P);
ivec4 texture(isampler1D sampler, float P);

11
src/glsl/builtins/tools/texture_builtins.py
View file

@ -71,7 +71,7 @@ def generate_sigs(g, tex_inst, sampler_type, variant = 0, unused_fields = 0):
print "\n (declare (in) " + vec_type("i" if tex_inst == "txf" else "", coord_dim + extra_dim) + " P)",
if tex_inst == "txl":
print "\n (declare (in) float lod)",
elif tex_inst == "txf" or tex_inst == "txs":
elif tex_inst == "txf" or (tex_inst == "txs" and "Rect" not in sampler_type):
print "\n (declare (in) int lod)",
elif tex_inst == "txd":
grad_type = vec_type("", coord_dim)
@ -115,7 +115,12 @@ def generate_sigs(g, tex_inst, sampler_type, variant = 0, unused_fields = 0):
# Bias/explicit LOD/gradient:
if tex_inst == "txb":
print "(var_ref bias)",
elif tex_inst == "txl" or tex_inst == "txf" or tex_inst == "txs":
elif tex_inst == "txs":
if "Rect" not in sampler_type:
print "(var_ref lod)",
else:
print "(constant int (0))"
elif tex_inst == "txl" or tex_inst == "txf":
print "(var_ref lod)",
elif tex_inst == "txd":
print "((var_ref dPdx) (var_ref dPdy))",
@ -153,6 +158,8 @@ def generate_texture_functions(fs):
generate_sigs("", "txs", "CubeShadow")
generate_sigs("", "txs", "1DArrayShadow")
generate_sigs("", "txs", "2DArrayShadow")
generate_fiu_sigs("txs", "2DRect")
generate_sigs("", "txs", "2DRectShadow")
end_function(fs, "textureSize")
start_function("texture")