Commit 22d07660 by Nicolas Capens

Fix compilation regression on Linux.

Change-Id: I8a2706ed0cf92bc8841823b181a9f88b819d4337 Reviewed-on: https://swiftshader-review.googlesource.com/2960Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent f66c110c
...@@ -1925,17 +1925,14 @@ bool Context::getIntegerv(GLenum pname, GLint *params) ...@@ -1925,17 +1925,14 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
UNIMPLEMENTED(); UNIMPLEMENTED();
*params = IMPLEMENTATION_MAX_DRAW_BUFFERS; *params = IMPLEMENTATION_MAX_DRAW_BUFFERS;
break; break;
case GL_MAX_ELEMENT_INDEX: // integer, at least 16777215 case GL_MAX_ELEMENT_INDEX:
UNIMPLEMENTED(); *params = MAX_ELEMENT_INDEX;
*params = 16777215;
break; break;
case GL_MAX_ELEMENTS_INDICES: // integer case GL_MAX_ELEMENTS_INDICES:
UNIMPLEMENTED(); *params = MAX_ELEMENTS_INDICES;
*params = 0;
break; break;
case GL_MAX_ELEMENTS_VERTICES: // integer case GL_MAX_ELEMENTS_VERTICES:
UNIMPLEMENTED(); *params = MAX_ELEMENTS_VERTICES;
*params = 0;
break; break;
case GL_MAX_FRAGMENT_INPUT_COMPONENTS: // integer, at least 128 case GL_MAX_FRAGMENT_INPUT_COMPONENTS: // integer, at least 128
UNIMPLEMENTED(); UNIMPLEMENTED();
......
...@@ -80,6 +80,9 @@ enum ...@@ -80,6 +80,9 @@ enum
MAX_COMBINED_TEXTURE_IMAGE_UNITS = MAX_TEXTURE_IMAGE_UNITS + MAX_VERTEX_TEXTURE_IMAGE_UNITS, MAX_COMBINED_TEXTURE_IMAGE_UNITS = MAX_TEXTURE_IMAGE_UNITS + MAX_VERTEX_TEXTURE_IMAGE_UNITS,
MAX_FRAGMENT_UNIFORM_VECTORS = FRAGMENT_UNIFORM_VECTORS - 3, // Reserve space for gl_DepthRange MAX_FRAGMENT_UNIFORM_VECTORS = FRAGMENT_UNIFORM_VECTORS - 3, // Reserve space for gl_DepthRange
MAX_DRAW_BUFFERS = 1, MAX_DRAW_BUFFERS = 1,
MAX_ELEMENT_INDEX = 0x7FFFFFFF,
MAX_ELEMENTS_INDICES = 0x7FFFFFFF,
MAX_ELEMENTS_VERTICES = 0x7FFFFFFF
}; };
const GLenum compressedTextureFormats[] = const GLenum compressedTextureFormats[] =
......
...@@ -1819,7 +1819,7 @@ void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const G ...@@ -1819,7 +1819,7 @@ void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const G
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
} }
context->drawElements(mode, 0, UINT_MAX, count, type, indices); context->drawElements(mode, 0, MAX_ELEMENT_INDEX, count, type, indices);
} }
} }
...@@ -1905,7 +1905,7 @@ void GL_APIENTRY glDrawElementsInstancedEXT(GLenum mode, GLsizei count, GLenum t ...@@ -1905,7 +1905,7 @@ void GL_APIENTRY glDrawElementsInstancedEXT(GLenum mode, GLsizei count, GLenum t
return error(GL_INVALID_OPERATION); return error(GL_INVALID_OPERATION);
} }
context->drawElements(mode, 0, UINT_MAX, count, type, indices, instanceCount); context->drawElements(mode, 0, MAX_ELEMENT_INDEX, count, type, indices, instanceCount);
} }
} }
......
...@@ -2700,7 +2700,7 @@ void GL_APIENTRY glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type ...@@ -2700,7 +2700,7 @@ void GL_APIENTRY glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type
return error(GL_INVALID_OPERATION); return error(GL_INVALID_OPERATION);
} }
context->drawElements(mode, 0, UINT_MAX, count, type, indices, instanceCount); context->drawElements(mode, 0, MAX_ELEMENT_INDEX, count, type, indices, instanceCount);
} }
} }
......
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