fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 19:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: Remove all vestiges of glFramebufferTextureFaceARB

Browse source 
Mesa does not (and probably never will) support GL_ARB_geometry_shader4,
so this function will never exist.  Having a function that is
exec="skip" and offset="assign" is just weird.

There are still a couple 'exec="skip" offset="assign"' functions
remaining.  These remain because we either support GLX protocol for them
(glSampleMaskSGIS and glSamplePatternSGIS) or older DRI drivers still
need them in the dispatch table (glResizeBuffersMESA).  The SGIS
functions can be removed later.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Ian Romanick 2015-05-12 12:24:04 -07:00
parent 0784bb01b5
commit 5aaabd7630
4 changed files with 5 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mapi/glapi/gen/ARB_geometry_shader4.xml
View file

@ -45,7 +45,7 @@
<param name="level" type="GLint"/>
<param name="layer" type="GLint"/>
</function>
<function name="FramebufferTextureFaceARB" exec="skip" offset="assign">
<function name="FramebufferTextureFaceARB" exec="skip">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="texture" type="GLuint"/>

1
src/mapi/glapi/tests/check_table.cpp
View file

@ -1137,7 +1137,6 @@ const struct name_offset known_dispatch[] = {
{ "glDrawElementsInstancedARB", _O(DrawElementsInstancedARB) },
{ "glRenderbufferStorageMultisample", _O(RenderbufferStorageMultisample) },
{ "glFramebufferTexture", _O(FramebufferTexture) },
{ "glFramebufferTextureFaceARB", _O(FramebufferTextureFaceARB) },
{ "glProgramParameteri", _O(ProgramParameteri) },
{ "glVertexAttribDivisor", _O(VertexAttribDivisor) },
{ "glFlushMappedBufferRange", _O(FlushMappedBufferRange) },

30
src/mesa/main/dlist.c
View file

@ -7592,28 +7592,6 @@ save_FramebufferTexture(GLenum target, GLenum attachment,
}
}
static void GLAPIENTRY
save_FramebufferTextureFace(GLenum target, GLenum attachment,
GLuint texture, GLint level, GLenum face)
{
Node *n;
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
n = alloc_instruction(ctx, OPCODE_FRAMEBUFFER_TEXTURE_FACE, 5);
if (n) {
n[1].e = target;
n[2].e = attachment;
n[3].ui = texture;
n[4].i = level;
n[5].e = face;
}
if (ctx->ExecuteFlag) {
CALL_FramebufferTextureFaceARB(ctx->Exec, (target, attachment, texture,
level, face));
}
}
static void GLAPIENTRY
save_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
@ -8873,11 +8851,6 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_FramebufferTexture(ctx->Exec, (n[1].e, n[2].e,
n[3].ui, n[4].i));
break;
case OPCODE_FRAMEBUFFER_TEXTURE_FACE:
CALL_FramebufferTextureFaceARB(ctx->Exec, (n[1].e, n[2].e,
n[3].ui, n[4].i, n[5].e));
break;
/* GL_ARB_sync */
case OPCODE_WAIT_SYNC:
{
@ -9644,10 +9617,9 @@ _mesa_initialize_save_table(const struct gl_context *ctx)
SET_BlendEquationiARB(table, save_BlendEquationi);
SET_BlendEquationSeparateiARB(table, save_BlendEquationSeparatei);
/* GL_ARB_geometry_shader4 */
/* OpenGL 3.2 */
SET_ProgramParameteri(table, save_ProgramParameteri);
SET_FramebufferTexture(table, save_FramebufferTexture);
SET_FramebufferTextureFaceARB(table, save_FramebufferTextureFace);
/* GL_NV_conditional_render */
SET_BeginConditionalRender(table, save_BeginConditionalRender);

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

@ -535,12 +535,9 @@ const struct function gl_core_functions_possible[] = {
{ "glGetInteger64i_v", 32, -1 },
{ "glGetBufferParameteri64v", 32, -1 },
{ "glFramebufferTexture", 32, -1 },
/* GL_ARB_geometry_shader4 */
{ "glProgramParameteriARB", 32, -1 },
{ "glFramebufferTextureARB", 32, -1 },
{ "glFramebufferTextureLayerARB", 32, -1 },
{ "glFramebufferTextureFaceARB", 32, -1 },
{ "glProgramParameteri", 32, -1 },
{ "glFramebufferTexture", 32, -1 },
{ "glFramebufferTextureLayer", 32, -1 },
/* GL 3.3 */
{ "glVertexAttribDivisor", 33, -1 },