Skip to content

A
angle
Commit 6c9b2ae9 by Jamie Madill
Options

Revert "D3D11: Use clamp wrap mode for Integer textures."

dEQP-GLES3 texture failures: http://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Release%20dEQP%20%28NVIDIA%29/builds/4510/steps/angle_deqp_gles3_tests/logs/stdio dEQP-GLES3.functional.shaders.texture_functions.texture.isampler* dEQP-GLES3.functional.shaders.texture_functions.texture.usampler* BUG=angleproject:1244 This reverts commit 7a6a1ffe. Change-Id: I0e25e7aed0e0d78015d5b8f5a7b9a81e0a5fca4e Reviewed-on: https://chromium-review.googlesource.com/316641Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 8c46ab11
Showing with 36 additions and 18 deletions
src/compiler/translator/OutputHLSL.cpp
...@@ -1116,9 +1116,7 @@ void OutputHLSL::header(TInfoSinkBase &out, const BuiltInFunctionEmulator *built ...@@ -1116,9 +1116,7 @@ void OutputHLSL::header(TInfoSinkBase &out, const BuiltInFunctionEmulator *built
TString addressx = ""; TString addressx = "";
TString addressy = ""; TString addressy = "";
TString addressz = ""; TString addressz = "";
TString closex = ""; TString close = "";
TString closey = "";
TString closez = "";
if (IsIntegerSampler(textureFunction->sampler) || if (IsIntegerSampler(textureFunction->sampler) ||
textureFunction->method == TextureFunction::FETCH) textureFunction->method == TextureFunction::FETCH)
...@@ -1133,23 +1131,23 @@ void OutputHLSL::header(TInfoSinkBase &out, const BuiltInFunctionEmulator *built ...@@ -1133,23 +1131,23 @@ void OutputHLSL::header(TInfoSinkBase &out, const BuiltInFunctionEmulator *built
// Convert from normalized floating-point to integer // Convert from normalized floating-point to integer
if (textureFunction->method != TextureFunction::FETCH) if (textureFunction->method != TextureFunction::FETCH)
{ {
// We hard-code the clamp wrap mode for integer textures. addressx = "int(floor(width * frac((";
// TODO(jmadill): Figure out how to integer texture wrap modes. addressy = "int(floor(height * frac((";
addressx = "int(clamp(round((width *";
addressy = "int(clamp(round((height * ";
closex = ") - 0.5f), 0.0f, width - 1.0f))";
closey = ") - 0.5f), 0.0f, height - 1.0f))";
if (IsSamplerArray(textureFunction->sampler)) if (IsSamplerArray(textureFunction->sampler))
{ {
addressz = "int(max(0, min(layers - 1, floor(0.5 + "; addressz = "int(max(0, min(layers - 1, floor(0.5 + ";
closez = "))))";
} }
else if (IsSampler3D(textureFunction->sampler)) else if (IsSamplerCube(textureFunction->sampler))
{ {
addressz = "int(clamp(round((depth * "; addressz = "((((";
closez = ") - 0.5f), 0.0f, depth - 1.0f))";
} }
else
{
addressz = "int(floor(depth * frac((";
}
close = "))))";
} }
} }
else else
...@@ -1175,7 +1173,7 @@ void OutputHLSL::header(TInfoSinkBase &out, const BuiltInFunctionEmulator *built ...@@ -1175,7 +1173,7 @@ void OutputHLSL::header(TInfoSinkBase &out, const BuiltInFunctionEmulator *built
} }
} }
out << addressx + ("t.x" + proj) + closex + ", " + addressy + ("t.y" + proj) + closey; out << addressx + ("t.x" + proj) + close + ", " + addressy + ("t.y" + proj) + close;
if (mOutputType == SH_HLSL9_OUTPUT) if (mOutputType == SH_HLSL9_OUTPUT)
{ {
...@@ -1215,7 +1213,7 @@ void OutputHLSL::header(TInfoSinkBase &out, const BuiltInFunctionEmulator *built ...@@ -1215,7 +1213,7 @@ void OutputHLSL::header(TInfoSinkBase &out, const BuiltInFunctionEmulator *built
} }
else else
{ {
out << ", " + addressz + ("t.z" + proj) + closez; out << ", " + addressz + ("t.z" + proj) + close;
} }
} }
......
src/tests/deqp_support/deqp_gles3_test_expectations.txt
...@@ -257,18 +257,24 @@ ...@@ -257,18 +257,24 @@
1095 WIN : dEQP-GLES3.functional.texture.specification.basic_copytexsubimage2d.cube_luminance_alpha = FAIL 1095 WIN : dEQP-GLES3.functional.texture.specification.basic_copytexsubimage2d.cube_luminance_alpha = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.basic_copytexsubimage2d.cube_rgb = FAIL 1095 WIN : dEQP-GLES3.functional.texture.specification.basic_copytexsubimage2d.cube_rgb = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.basic_copytexsubimage2d.cube_rgba = FAIL 1095 WIN : dEQP-GLES3.functional.texture.specification.basic_copytexsubimage2d.cube_rgba = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_pbo.rgb5_a1_3d = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_depth.depth_component32f_2d_array = FAIL 1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_depth.depth_component32f_2d_array = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_depth.depth32f_stencil8_2d_array = FAIL 1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_depth.depth32f_stencil8_2d_array = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_depth_pbo.depth_component32f_2d_array = FAIL 1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_depth_pbo.depth_component32f_2d_array = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_depth_pbo.depth32f_stencil8_2d_array = FAIL 1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_depth_pbo.depth32f_stencil8_2d_array = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_depth_pbo.depth_component24_2d_array = FAIL 1095 WIN : dEQP-GLES3.functional.texture.specification.teximage3d_depth_pbo.depth_component24_2d_array = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb5_a1_3d = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.texsubimage3d_depth.depth_component32f_2d_array = FAIL 1095 WIN : dEQP-GLES3.functional.texture.specification.texsubimage3d_depth.depth_component32f_2d_array = FAIL
1095 WIN : dEQP-GLES3.functional.texture.specification.texsubimage3d_depth.depth32f_stencil8_2d_array = FAIL 1095 WIN : dEQP-GLES3.functional.texture.specification.texsubimage3d_depth.depth32f_stencil8_2d_array = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d.3 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d.3 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d.5 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d.7 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d.7 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d.8 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d_array.3 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d_array.3 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d_array.4 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d_array.5 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d_array.7 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d_array.7 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d_array.9 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_2d_array.8 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_3d.3 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_3d.3 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_3d.4 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_3d.4 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_3d.5 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.2_units.only_3d.5 = FAIL
...@@ -281,12 +287,15 @@ ...@@ -281,12 +287,15 @@
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.0 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.0 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.1 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.1 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.3 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.3 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.5 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.6 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.7 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.7 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.8 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.8 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.9 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d.9 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.0 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.0 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.1 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.1 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.3 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.3 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.5 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.6 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.6 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.7 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.7 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.8 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.only_2d_array.8 = FAIL
...@@ -303,14 +312,14 @@ ...@@ -303,14 +312,14 @@
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.mixed.1 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.mixed.1 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.mixed.2 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.mixed.2 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.mixed.3 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.mixed.3 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.mixed.6 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.4_units.mixed.9 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.4_units.mixed.9 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.0 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.1 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.1 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.2 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.3 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.3 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.4 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.4 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.5 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.5 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.6 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.6 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.7 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.8 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.8 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.9 = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d.9 = FAIL
1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d_array.* = FAIL 1095 WIN : dEQP-GLES3.functional.texture.units.8_units.only_2d_array.* = FAIL
...@@ -374,6 +383,17 @@ ...@@ -374,6 +383,17 @@
1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL 1096 WIN : dEQP-GLES3.functional.fragment_ops.blend.fbo_srgb.equation_src_func_dst_func.reverse_subtract_one_minus_constant_alpha_one_minus_constant_color = FAIL
1096 WIN : dEQP-GLES3.functional.fragment_ops.random.* = FAIL 1096 WIN : dEQP-GLES3.functional.fragment_ops.random.* = FAIL
1096 WIN : dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.* = FAIL 1096 WIN : dEQP-GLES3.functional.fragment_ops.interaction.basic_shader.* = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.rgba32i = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.rgba16ui = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.rgba8i = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.rgb10_a2ui = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.rg32ui = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.rg8i = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.r32i = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.r16i = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.r16ui = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.r8i = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.tex3d.r8ui = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgba8 = FAIL 1097 WIN : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgba8 = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.srgb8_alpha8 = FAIL 1097 WIN : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.srgb8_alpha8 = FAIL
1097 WIN : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgb10_a2 = FAIL 1097 WIN : dEQP-GLES3.functional.fbo.color.repeated_clear.sample.tex2d.rgb10_a2 = FAIL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment