fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: add bind_textures() helper

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset 2017-07-21 11:03:09 +02:00
parent 9f1fab9533
commit 90f691b5be
1 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/mesa/main/texobj.c
View file

@ -1805,25 +1805,11 @@ _mesa_BindTextureUnit(GLuint unit, GLuint texture)
/**
* OpenGL 4.4 / GL_ARB_multi_bind glBindTextures().
*/
void GLAPIENTRY
_mesa_BindTextures(GLuint first, GLsizei count, const GLuint *textures)
static ALWAYS_INLINE void
bind_textures(struct gl_context *ctx, GLuint first, GLsizei count,
const GLuint *textures, bool no_error)
{
GET_CURRENT_CONTEXT(ctx);
GLint i;
/* The ARB_multi_bind spec says:
*
* "An INVALID_OPERATION error is generated if <first> + <count>
* is greater than the number of texture image units supported
* by the implementation."
*/
if (first + count > ctx->Const.MaxCombinedTextureImageUnits) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glBindTextures(first=%u + count=%d > the value of "
"GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS=%u)",
first, count, ctx->Const.MaxCombinedTextureImageUnits);
return;
}
GLsizei i;
if (textures) {
/* Note that the error semantics for multi-bind commands differ from
@ -1860,7 +1846,7 @@ _mesa_BindTextures(GLuint first, GLsizei count, const GLuint *textures)
if (texObj && texObj->Target != 0) {
bind_texture_object(ctx, first + i, texObj);
} else {
} else if (!no_error) {
/* The ARB_multi_bind spec says:
*
* "An INVALID_OPERATION error is generated if any value
@ -1886,6 +1872,29 @@ _mesa_BindTextures(GLuint first, GLsizei count, const GLuint *textures)
}
void GLAPIENTRY
_mesa_BindTextures(GLuint first, GLsizei count, const GLuint *textures)
{
GET_CURRENT_CONTEXT(ctx);
/* The ARB_multi_bind spec says:
*
* "An INVALID_OPERATION error is generated if <first> + <count>
* is greater than the number of texture image units supported
* by the implementation."
*/
if (first + count > ctx->Const.MaxCombinedTextureImageUnits) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glBindTextures(first=%u + count=%d > the value of "
"GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS=%u)",
first, count, ctx->Const.MaxCombinedTextureImageUnits);
return;
}
bind_textures(ctx, first, count, textures, false);
}
/**
* Set texture priorities.
*