AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/varray: create get_array_format() helper

Browse Source 
This will help us split array validation from array update.

V2: add const to ctx param

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Timothy Arceri
2017-03-31 14:44:59 +11:00
parent d0608c43c5
commit 9e60742ddc
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/varray.c
+20 -11
View File
@@ -258,6 +258,24 @@ get_legal_types_mask(const struct gl_context *ctx)
return legalTypesMask;
}
static GLenum
get_array_format(const struct gl_context *ctx, GLint sizeMax, GLint *size)
{
GLenum format = GL_RGBA;
/* Do size parameter checking.
* If sizeMax = BGRA_OR_4 it means that size = GL_BGRA is legal and
* must be handled specially.
*/
if (ctx->Extensions.EXT_vertex_array_bgra && sizeMax == BGRA_OR_4 &&
*size == GL_BGRA) {
format = GL_BGRA;
*size = 4;
}
return format;
}
/**
* \param attrib The index of the attribute array
@@ -329,7 +347,7 @@ update_array_format(struct gl_context *ctx,
GLuint relativeOffset)
{
GLbitfield typeBit;
GLenum format = GL_RGBA;
GLenum format = get_array_format(ctx, sizeMax, &size);
/* at most, one of these bools can be true */
assert((int) normalized + (int) integer + (int) doubles <= 1);
@@ -359,13 +377,7 @@ update_array_format(struct gl_context *ctx,
return false;
}
/* Do size parameter checking.
* If sizeMax = BGRA_OR_4 it means that size = GL_BGRA is legal and
* must be handled specially.
*/
if (ctx->Extensions.EXT_vertex_array_bgra &&
sizeMax == BGRA_OR_4 &&
size == GL_BGRA) {
if (format == GL_BGRA) {
/* Page 298 of the PDF of the OpenGL 4.3 (Core Profile) spec says:
*
* "An INVALID_OPERATION error is generated under any of the following
@@ -397,9 +409,6 @@ update_array_format(struct gl_context *ctx,
"%s(size=GL_BGRA and normalized=GL_FALSE)", func);
return false;
}
format = GL_BGRA;
size = 4;
}
else if (size < sizeMin || size > sizeMax || size > 4) {
_mesa_error(ctx, GL_INVALID_VALUE, "%s(size=%d)", func, size);