summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorernstm@chromium.org <ernstm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-12 23:11:26 +0000
committerernstm@chromium.org <ernstm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-12 23:11:26 +0000
commita2b73531e1001f7afe3a2c65a2a6ea1172df8adc (patch)
treee9c7477c7cb3d27cbc90a032161f06e30ba63bed
parent6669f65a802461d7c9ded94776dd7dff8795b81c (diff)
downloadsrc-a2b73531e1001f7afe3a2c65a2a6ea1172df8adc.tar.gz
Made Mesa use consistent *_FLOAT_TO_UBYTE conversions.
The optimized versions producd slightly different results than the un-optimized versions (used when DEBUG is defined). This caused inconsistent test results. BUG=181712 Review URL: https://chromiumcodereview.appspot.com/12764015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src/third_party/mesa/MesaLib@187688 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--src/mesa/main/macros.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index b2ec0ba..ee07011 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -134,7 +134,13 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
*** UNCLAMPED_FLOAT_TO_UBYTE: clamp float to [0,1] and map to ubyte in [0,255]
*** CLAMPED_FLOAT_TO_UBYTE: map float known to be in [0,1] to ubyte in [0,255]
***/
-#if defined(USE_IEEE) && !defined(DEBUG)
+/* (ernstm): Disabled the IEEE float optimized
+ * UNCLAMPED_FLOAT_TO_UBYTE and CLAMPED_FLOAT_TO_UBYTE in
+ * chromium version of mesa. They produce slightly
+ * different results than the un-optimized versions that are
+ * used when DEBUG is defined.
+ */
+#if 0 && defined(USE_IEEE) && !defined(DEBUG)
#define IEEE_0996 0x3f7f0000 /* 0.996 or so */
/* This function/macro is sensitive to precision. Test very carefully
* if you change it!