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

mesa: Implement VertexArrayAttrib[I|L]Format 

Reviewed-by: Laura Ekstrand <laura@jlekstrand.net>
This commit is contained in:
Fredrik Höglund 2015-03-02 18:44:00 +01:00
parent fa350eadfb
commit f0030b0f1f
4 changed files with 122 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mapi/glapi/gen/ARB_direct_state_access.xml
View File

@ -487,6 +487,31 @@
<param name="strides" type="const GLsizei *" />
</function>
<function name="VertexArrayAttribFormat" offset="assign">
<param name="vaobj" type="GLuint" />
<param name="attribindex" type="GLuint" />
<param name="size" type="GLint" />
<param name="type" type="GLenum" />
<param name="normalized" type="GLboolean" />
<param name="relativeoffset" type="GLuint" />
</function>
<function name="VertexArrayAttribIFormat" offset="assign">
<param name="vaobj" type="GLuint" />
<param name="attribindex" type="GLuint" />
<param name="size" type="GLint" />
<param name="type" type="GLenum" />
<param name="relativeoffset" type="GLuint" />
</function>
<function name="VertexArrayAttribLFormat" offset="assign">
<param name="vaobj" type="GLuint" />
<param name="attribindex" type="GLuint" />
<param name="size" type="GLint" />
<param name="type" type="GLenum" />
<param name="relativeoffset" type="GLuint" />
</function>
<!-- Sampler object functions -->
<function name="CreateSamplers" offset="assign">

3
src/mesa/main/tests/dispatch_sanity.cpp
View File

@ -1023,6 +1023,9 @@ const struct function gl_core_functions_possible[] = {
{ "glVertexArrayElementBuffer", 45, -1 },
{ "glVertexArrayVertexBuffer", 45, -1 },
{ "glVertexArrayVertexBuffers", 45, -1 },
{ "glVertexArrayAttribFormat", 45, -1 },
{ "glVertexArrayAttribIFormat", 45, -1 },
{ "glVertexArrayAttribLFormat", 45, -1 },
{ "glCreateSamplers", 45, -1 },
{ "glCreateProgramPipelines", 45, -1 },
{ "glCreateQueries", 45, -1 },

79
src/mesa/main/varray.c
View File

@ -1876,6 +1876,85 @@ _mesa_VertexAttribLFormat(GLuint attribIndex, GLint size, GLenum type,
}
static void
vertex_array_attrib_format(GLuint vaobj, GLuint attribIndex, GLint size,
GLenum type, GLboolean normalized,
GLboolean integer, GLboolean doubles,
GLbitfield legalTypes, GLsizei maxSize,
GLuint relativeOffset, const char *func)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_vertex_array_object *vao;
ASSERT_OUTSIDE_BEGIN_END(ctx);
/* The ARB_direct_state_access spec says:
*
* "An INVALID_OPERATION error is generated by VertexArrayAttrib*Format
* if <vaobj> is not [compatibility profile: zero or] the name of an
* existing vertex array object."
*/
vao = _mesa_lookup_vao_err(ctx, vaobj, func);
if (!vao)
return;
/* The ARB_vertex_attrib_binding spec says:
*
* "The error INVALID_VALUE is generated if index is greater than or equal
* to the value of MAX_VERTEX_ATTRIBS."
*/
if (attribIndex >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs) {
_mesa_error(ctx, GL_INVALID_VALUE,
"%s(attribindex=%u > GL_MAX_VERTEX_ATTRIBS)",
func, attribIndex);
return;
}
FLUSH_VERTICES(ctx, 0);
update_array_format(ctx, func, vao,
VERT_ATTRIB_GENERIC(attribIndex),
legalTypes, 1, maxSize, size, type, normalized,
integer, doubles, relativeOffset);
}
void GLAPIENTRY
_mesa_VertexArrayAttribFormat(GLuint vaobj, GLuint attribIndex, GLint size,
GLenum type, GLboolean normalized,
GLuint relativeOffset)
{
vertex_array_attrib_format(vaobj, attribIndex, size, type, normalized,
GL_FALSE, GL_FALSE, ATTRIB_FORMAT_TYPES_MASK,
BGRA_OR_4, relativeOffset,
"glVertexArrayAttribFormat");
}
void GLAPIENTRY
_mesa_VertexArrayAttribIFormat(GLuint vaobj, GLuint attribIndex,
GLint size, GLenum type,
GLuint relativeOffset)
{
vertex_array_attrib_format(vaobj, attribIndex, size, type, GL_FALSE,
GL_TRUE, GL_FALSE, ATTRIB_IFORMAT_TYPES_MASK,
4, relativeOffset,
"glVertexArrayAttribIFormat");
}
void GLAPIENTRY
_mesa_VertexArrayAttribLFormat(GLuint vaobj, GLuint attribIndex,
GLint size, GLenum type,
GLuint relativeOffset)
{
vertex_array_attrib_format(vaobj, attribIndex, size, type, GL_FALSE,
GL_FALSE, GL_TRUE, ATTRIB_LFORMAT_TYPES_MASK,
4, relativeOffset,
"glVertexArrayAttribLFormat");
}
void GLAPIENTRY
_mesa_VertexAttribBinding(GLuint attribIndex, GLuint bindingIndex)
{

15
src/mesa/main/varray.h
View File

@ -307,14 +307,29 @@ extern void GLAPIENTRY
_mesa_VertexAttribFormat(GLuint attribIndex, GLint size, GLenum type,
GLboolean normalized, GLuint relativeOffset);
extern void GLAPIENTRY
_mesa_VertexArrayAttribFormat(GLuint vaobj, GLuint attribIndex, GLint size,
GLenum type, GLboolean normalized,
GLuint relativeOffset);
extern void GLAPIENTRY
_mesa_VertexAttribIFormat(GLuint attribIndex, GLint size, GLenum type,
GLuint relativeOffset);
extern void GLAPIENTRY
_mesa_VertexArrayAttribIFormat(GLuint vaobj, GLuint attribIndex,
GLint size, GLenum type,
GLuint relativeOffset);
extern void GLAPIENTRY
_mesa_VertexAttribLFormat(GLuint attribIndex, GLint size, GLenum type,
GLuint relativeOffset);
extern void GLAPIENTRY
_mesa_VertexArrayAttribLFormat(GLuint vaobj, GLuint attribIndex,
GLint size, GLenum type,
GLuint relativeOffset);
extern void GLAPIENTRY
_mesa_VertexAttribBinding(GLuint attribIndex, GLuint bindingIndex);