summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c4
-rw-r--r--third_party/mesa/README.chromium2
2 files changed, 5 insertions, 1 deletions
diff --git a/third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c b/third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c
index 889164b..85a2c48 100644
--- a/third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c
+++ b/third_party/mesa/MesaLib/src/mesa/swrast/s_texcombine.c
@@ -23,7 +23,6 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-
#include "main/glheader.h"
#include "main/context.h"
#include "main/colormac.h"
@@ -35,6 +34,9 @@
#include "s_context.h"
#include "s_texcombine.h"
+#if defined(_MSC_VER)
+#pragma optimize("", off)
+#endif
/**
* Pointer to array of float[4]
diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium
index f98b2e6..bd7d07c 100644
--- a/third_party/mesa/README.chromium
+++ b/third_party/mesa/README.chromium
@@ -17,3 +17,5 @@ Modifications made with initial commit:
Later modifications:
- Added OSMesaGetProcAddress to MesaLib/src/mesa/drivers/osmesa/osmesa.def
+
+- Added #pragma optimize('', off) to MesaLib\src\mesa\swrast\s_textcombine.c