OSDN Git Service

Fix jb-mr1-gce-dev build.
authorNicolas Capens <capn@google.com>
Wed, 10 Feb 2016 02:17:32 +0000 (21:17 -0500)
committerNicolas Capens <capn@google.com>
Thu, 10 Mar 2016 15:52:45 +0000 (15:52 +0000)
Change-Id: Iec28db332fe328603a68c3073403bfbe6067bf44
Reviewed-on: https://swiftshader-review.googlesource.com/4735
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
(cherry picked from commit 5d0bad6eea31ee25437877c11e91c1b39be07030)
Reviewed-on: https://swiftshader-review.googlesource.com/4734
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
src/OpenGL/libGLESv2/libGLESv3.cpp

index 50ddbf8..94fe8c6 100644 (file)
@@ -18,6 +18,7 @@
 #include "Query.h"\r
 #include "Sampler.h"\r
 #include "Texture.h"\r
+#include "mathutil.h"\r
 #include "common/debug.h"\r
 \r
 #include <GLES3/gl3.h>\r
@@ -3912,7 +3913,7 @@ GL_APICALL void GL_APIENTRY glTexStorage3D(GLenum target, GLsizei levels, GLenum
                {\r
                case GL_TEXTURE_3D:\r
                {\r
-                       if(levels > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS || levels >(log2(std::max(std::max(width, height), depth)) + 1))\r
+                       if(levels > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS || levels > (log2(std::max(std::max(width, height), depth)) + 1))\r
                        {\r
                                return error(GL_INVALID_OPERATION);\r
                        }\r
@@ -3935,7 +3936,7 @@ GL_APICALL void GL_APIENTRY glTexStorage3D(GLenum target, GLsizei levels, GLenum
                        break;\r
                case GL_TEXTURE_2D_ARRAY:\r
                {\r
-                       if(levels > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS || levels >(log2(std::max(width, height)) + 1))\r
+                       if(levels > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS || levels > (log2(std::max(width, height)) + 1))\r
                        {\r
                                return error(GL_INVALID_OPERATION);\r
                        }\r