Commit dcc15922 by Nicolas Capens

Fix jb-mr1-gce-dev build.

Change-Id: Iec28db332fe328603a68c3073403bfbe6067bf44 Reviewed-on: https://swiftshader-review.googlesource.com/4735Reviewed-by: 's avatarGreg Hartman <ghartman@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com> (cherry picked from commit 5d0bad6eea31ee25437877c11e91c1b39be07030) Reviewed-on: https://swiftshader-review.googlesource.com/4734Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent f3304236
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "Query.h" #include "Query.h"
#include "Sampler.h" #include "Sampler.h"
#include "Texture.h" #include "Texture.h"
#include "mathutil.h"
#include "common/debug.h" #include "common/debug.h"
#include <GLES3/gl3.h> #include <GLES3/gl3.h>
...@@ -3912,7 +3913,7 @@ GL_APICALL void GL_APIENTRY glTexStorage3D(GLenum target, GLsizei levels, GLenum ...@@ -3912,7 +3913,7 @@ GL_APICALL void GL_APIENTRY glTexStorage3D(GLenum target, GLsizei levels, GLenum
{ {
case GL_TEXTURE_3D: case GL_TEXTURE_3D:
{ {
if(levels > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS || levels >(log2(std::max(std::max(width, height), depth)) + 1)) if(levels > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS || levels > (log2(std::max(std::max(width, height), depth)) + 1))
{ {
return error(GL_INVALID_OPERATION); return error(GL_INVALID_OPERATION);
} }
...@@ -3935,7 +3936,7 @@ GL_APICALL void GL_APIENTRY glTexStorage3D(GLenum target, GLsizei levels, GLenum ...@@ -3935,7 +3936,7 @@ GL_APICALL void GL_APIENTRY glTexStorage3D(GLenum target, GLsizei levels, GLenum
break; break;
case GL_TEXTURE_2D_ARRAY: case GL_TEXTURE_2D_ARRAY:
{ {
if(levels > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS || levels >(log2(std::max(width, height)) + 1)) if(levels > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS || levels > (log2(std::max(width, height)) + 1))
{ {
return error(GL_INVALID_OPERATION); return error(GL_INVALID_OPERATION);
} }
......
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