commit c98406ab9b02991c0d95a7236770a08ae26b03a8
author Nicolas Capens <nicolas@transgaming.com> Wed Jul 10 14:52:44 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:08:11 2013 -0400
tree ea7e29a67d90b73cf380458daa6e6de9cdcaaf24
parent b70e5f7c3a98e3a8114d36f6dd978baa735401f4

Use the simpler form of GetDimensions.

TRAC #23485
Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Nicolas Capens

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index 9e24dce..0938d02 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -987,19 +987,19 @@
                 {
                     if (IsSamplerArray(textureFunction->sampler))
                     {
-                        out << "    uint width; uint height; uint layers; uint numberOfLevels;\n"
-                               "    x.GetDimensions(0, width, height, layers, numberOfLevels);\n";
+                        out << "    float width; float height; float layers;\n"
+                               "    x.GetDimensions(width, height, layers);\n";
                     }
                     else
                     {
-                        out << "    uint width; uint height; uint numberOfLevels;\n"
-                               "    x.GetDimensions(0, width, height, numberOfLevels);\n";
+                        out << "    float width; float height;\n"
+                               "    x.GetDimensions(width, height);\n";
                     }
                 }
                 else if (IsSampler3D(textureFunction->sampler))
                 {
-                    out << "    uint width; uint height; uint depth; uint numberOfLevels;\n"
-                           "    x.GetDimensions(0, width, height, depth, numberOfLevels);\n";
+                    out << "    float width; float height; float depth;\n"
+                           "    x.GetDimensions(width, height, depth);\n";
                 }
                 else UNREACHABLE();
             }
@@ -1060,8 +1060,8 @@
                   default: UNREACHABLE();
                 }
             
-                addressx = "int(floor(float(width) * frac((";
-                addressy = "int(floor(float(height) * frac((";
+                addressx = "int(floor(width * frac((";
+                addressy = "int(floor(height * frac((";
 
                 if (IsSamplerArray(textureFunction->sampler))
                 {
@@ -1069,7 +1069,7 @@
                 }
                 else
                 {
-                    addressz = "int(floor(float(depth) * frac((";
+                    addressz = "int(floor(depth * frac((";
                 }
 
                 close = "))))";