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

mesa: add EXT_dsa glClientAttribDefaultEXT / glPushClientAttribDefaultEXT

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2019-05-28 10:27:52 +02:00
parent 01666ad206
commit eaeab0a998
5 changed files with 93 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mapi/glapi/gen/EXT_direct_state_access.xml
View file

@ -102,6 +102,14 @@
<!-- OpenGL 1.1 -->
<function name="ClientAttribDefaultEXT">
<param name="mask" type="GLbitfield" />
</function>
<function name="PushClientAttribDefaultEXT">
<param name="mask" type="GLbitfield" />
</function>
<function name="GetTextureParameterivEXT">
<param name="texture" type="GLuint" />
<param name="target" type="GLenum" />

2
src/mapi/glapi/gen/static_data.py
View file

@ -1571,6 +1571,8 @@ offsets = {
"GetFramebufferParameterivMESA": 1535,
"NamedRenderbufferStorageEXT": 1536,
"GetNamedRenderbufferParameterivEXT": 1537,
"ClientAttribDefaultEXT": 1538,
"PushClientAttribDefaultEXT": 1539,
}
functions = [

75
src/mesa/main/attrib.c
View file

@ -43,6 +43,7 @@
#include "macros.h"
#include "matrix.h"
#include "multisample.h"
#include "pixelstore.h"
#include "points.h"
#include "polygon.h"
#include "shared.h"
@ -1852,6 +1853,80 @@ _mesa_PopClientAttrib(void)
}
}
void GLAPIENTRY
_mesa_ClientAttribDefaultEXT( GLbitfield mask )
{
if (mask & GL_CLIENT_PIXEL_STORE_BIT) {
_mesa_PixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
_mesa_PixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE);
_mesa_PixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0);
_mesa_PixelStorei(GL_UNPACK_SKIP_IMAGES, 0);
_mesa_PixelStorei(GL_UNPACK_ROW_LENGTH, 0);
_mesa_PixelStorei(GL_UNPACK_SKIP_ROWS, 0);
_mesa_PixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
_mesa_PixelStorei(GL_UNPACK_ALIGNMENT, 4);
_mesa_PixelStorei(GL_PACK_SWAP_BYTES, GL_FALSE);
_mesa_PixelStorei(GL_PACK_LSB_FIRST, GL_FALSE);
_mesa_PixelStorei(GL_PACK_IMAGE_HEIGHT, 0);
_mesa_PixelStorei(GL_PACK_SKIP_IMAGES, 0);
_mesa_PixelStorei(GL_PACK_ROW_LENGTH, 0);
_mesa_PixelStorei(GL_PACK_SKIP_ROWS, 0);
_mesa_PixelStorei(GL_PACK_SKIP_PIXELS, 0);
_mesa_PixelStorei(GL_PACK_ALIGNMENT, 4);
_mesa_BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
_mesa_BindBuffer(GL_PIXEL_PACK_BUFFER, 0);
}
if (mask & GL_CLIENT_VERTEX_ARRAY_BIT) {
GET_CURRENT_CONTEXT(ctx);
int i;
_mesa_BindBuffer(GL_ARRAY_BUFFER, 0);
_mesa_BindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
_mesa_DisableClientState(GL_EDGE_FLAG_ARRAY);
_mesa_EdgeFlagPointer(0, 0);
_mesa_DisableClientState(GL_INDEX_ARRAY);
_mesa_IndexPointer(GL_FLOAT, 0, 0);
_mesa_DisableClientState(GL_SECONDARY_COLOR_ARRAY);
_mesa_SecondaryColorPointer(4, GL_FLOAT, 0, 0);
_mesa_DisableClientState(GL_FOG_COORD_ARRAY);
_mesa_FogCoordPointer(GL_FLOAT, 0, 0);
for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
_mesa_ClientActiveTexture(GL_TEXTURE0 + i);
_mesa_DisableClientState(GL_TEXTURE_COORD_ARRAY);
_mesa_TexCoordPointer(4, GL_FLOAT, 0, 0);
}
_mesa_DisableClientState(GL_COLOR_ARRAY);
_mesa_ColorPointer(4, GL_FLOAT, 0, 0);
_mesa_DisableClientState(GL_NORMAL_ARRAY);
_mesa_NormalPointer(GL_FLOAT, 0, 0);
_mesa_DisableClientState(GL_VERTEX_ARRAY);
_mesa_VertexPointer(4, GL_FLOAT, 0, 0);
for (i = 0; i < ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs; i++) {
_mesa_DisableVertexAttribArray(i);
_mesa_VertexAttribPointer(i, 4, GL_FLOAT, GL_FALSE, 0, 0);
}
_mesa_ClientActiveTexture(GL_TEXTURE0);
}
}
void GLAPIENTRY
_mesa_PushClientAttribDefaultEXT( GLbitfield mask )
{
_mesa_PushClientAttrib(mask);
_mesa_ClientAttribDefaultEXT(mask);
}
/**
* Free any attribute state data that might be attached to the context.

6
src/mesa/main/attrib.h
View file

@ -43,6 +43,12 @@ _mesa_PushClientAttrib( GLbitfield mask );
extern void GLAPIENTRY
_mesa_PopClientAttrib( void );
extern void GLAPIENTRY
_mesa_ClientAttribDefaultEXT( GLbitfield mask );
extern void GLAPIENTRY
_mesa_PushClientAttribDefaultEXT( GLbitfield mask );
extern void
_mesa_init_attrib( struct gl_context *ctx );

4
src/mesa/main/tests/dispatch_sanity.cpp
View file

@ -1031,8 +1031,8 @@ const struct function common_desktop_functions_possible[] = {
{ "glMatrixPushEXT", 10, -1 },
{ "glMatrixPopEXT", 10, -1 },
/* GL_EXT_direct_state_access - GL 1.1 */
//{ "glClientAttribDefaultEXT", 11, -1 },
//{ "glPushClientAttribDefaultEXT", 11, -1 },
{ "glClientAttribDefaultEXT", 11, -1 },
{ "glPushClientAttribDefaultEXT", 11, -1 },
{ "glTextureParameteriEXT", 11, -1 },
{ "glTextureParameterivEXT", 11, -1 },
{ "glTextureParameterfEXT", 11, -1 },