mesa: Implement EnableVertexArrayAttrib
Reviewed-by: Laura Ekstrand <laura@jlekstrand.net>
This commit is contained in:
parent
96b6463463
commit
c99efbd3c2
|
@ -460,6 +460,11 @@
|
||||||
<param name="index" type="GLuint" />
|
<param name="index" type="GLuint" />
|
||||||
</function>
|
</function>
|
||||||
|
|
||||||
|
<function name="EnableVertexArrayAttrib" offset="assign">
|
||||||
|
<param name="vaobj" type="GLuint" />
|
||||||
|
<param name="index" type="GLuint" />
|
||||||
|
</function>
|
||||||
|
|
||||||
<!-- Sampler object functions -->
|
<!-- Sampler object functions -->
|
||||||
|
|
||||||
<function name="CreateSamplers" offset="assign">
|
<function name="CreateSamplers" offset="assign">
|
||||||
|
|
|
@ -1019,6 +1019,7 @@ const struct function gl_core_functions_possible[] = {
|
||||||
{ "glTextureBufferRange", 45, -1 },
|
{ "glTextureBufferRange", 45, -1 },
|
||||||
{ "glCreateVertexArrays", 45, -1 },
|
{ "glCreateVertexArrays", 45, -1 },
|
||||||
{ "glDisableVertexArrayAttrib", 45, -1 },
|
{ "glDisableVertexArrayAttrib", 45, -1 },
|
||||||
|
{ "glEnableVertexArrayAttrib", 45, -1 },
|
||||||
{ "glCreateSamplers", 45, -1 },
|
{ "glCreateSamplers", 45, -1 },
|
||||||
{ "glCreateProgramPipelines", 45, -1 },
|
{ "glCreateProgramPipelines", 45, -1 },
|
||||||
{ "glCreateQueries", 45, -1 },
|
{ "glCreateQueries", 45, -1 },
|
||||||
|
|
|
@ -718,20 +718,18 @@ _mesa_VertexAttribLPointer(GLuint index, GLint size, GLenum type,
|
||||||
size, type, stride, GL_TRUE, GL_FALSE, GL_TRUE, ptr);
|
size, type, stride, GL_TRUE, GL_FALSE, GL_TRUE, ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLAPIENTRY
|
|
||||||
_mesa_EnableVertexAttribArray(GLuint index)
|
|
||||||
{
|
|
||||||
struct gl_vertex_array_object *vao;
|
|
||||||
GET_CURRENT_CONTEXT(ctx);
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
enable_vertex_array_attrib(struct gl_context *ctx,
|
||||||
|
struct gl_vertex_array_object *vao,
|
||||||
|
GLuint index,
|
||||||
|
const char *func)
|
||||||
|
{
|
||||||
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs) {
|
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs) {
|
||||||
_mesa_error(ctx, GL_INVALID_VALUE,
|
_mesa_error(ctx, GL_INVALID_VALUE, "%s(index)", func);
|
||||||
"glEnableVertexAttribArrayARB(index)");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
vao = ctx->Array.VAO;
|
|
||||||
|
|
||||||
assert(VERT_ATTRIB_GENERIC(index) < ARRAY_SIZE(vao->VertexAttrib));
|
assert(VERT_ATTRIB_GENERIC(index) < ARRAY_SIZE(vao->VertexAttrib));
|
||||||
|
|
||||||
if (!vao->VertexAttrib[VERT_ATTRIB_GENERIC(index)].Enabled) {
|
if (!vao->VertexAttrib[VERT_ATTRIB_GENERIC(index)].Enabled) {
|
||||||
|
@ -744,6 +742,36 @@ _mesa_EnableVertexAttribArray(GLuint index)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void GLAPIENTRY
|
||||||
|
_mesa_EnableVertexAttribArray(GLuint index)
|
||||||
|
{
|
||||||
|
GET_CURRENT_CONTEXT(ctx);
|
||||||
|
enable_vertex_array_attrib(ctx, ctx->Array.VAO, index,
|
||||||
|
"glEnableVertexAttribArray");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void GLAPIENTRY
|
||||||
|
_mesa_EnableVertexArrayAttrib(GLuint vaobj, GLuint index)
|
||||||
|
{
|
||||||
|
GET_CURRENT_CONTEXT(ctx);
|
||||||
|
struct gl_vertex_array_object *vao;
|
||||||
|
|
||||||
|
/* The ARB_direct_state_access specification says:
|
||||||
|
*
|
||||||
|
* "An INVALID_OPERATION error is generated by EnableVertexArrayAttrib
|
||||||
|
* and DisableVertexArrayAttrib if <vaobj> is not
|
||||||
|
* [compatibility profile: zero or] the name of an existing vertex
|
||||||
|
* array object."
|
||||||
|
*/
|
||||||
|
vao = _mesa_lookup_vao_err(ctx, vaobj, "glEnableVertexArrayAttrib");
|
||||||
|
if (!vao)
|
||||||
|
return;
|
||||||
|
|
||||||
|
enable_vertex_array_attrib(ctx, vao, index, "glEnableVertexArrayAttrib");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
disable_vertex_array_attrib(struct gl_context *ctx,
|
disable_vertex_array_attrib(struct gl_context *ctx,
|
||||||
struct gl_vertex_array_object *vao,
|
struct gl_vertex_array_object *vao,
|
||||||
|
|
|
@ -175,6 +175,10 @@ extern void GLAPIENTRY
|
||||||
_mesa_EnableVertexAttribArray(GLuint index);
|
_mesa_EnableVertexAttribArray(GLuint index);
|
||||||
|
|
||||||
|
|
||||||
|
extern void GLAPIENTRY
|
||||||
|
_mesa_EnableVertexArrayAttrib(GLuint vaobj, GLuint index);
|
||||||
|
|
||||||
|
|
||||||
extern void GLAPIENTRY
|
extern void GLAPIENTRY
|
||||||
_mesa_DisableVertexAttribArray(GLuint index);
|
_mesa_DisableVertexAttribArray(GLuint index);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue