On Wed, Apr 20, 2011 at 11:19 AM, Brian Paul <brian.e.p...@gmail.com> wrote: > On Tue, Apr 19, 2011 at 8:31 PM, nobled <nob...@dreamwidth.org> wrote: > [...] >> I added an XML file now, too; regenerating didn't work for me though, >> because I'm missing some >> XORG thing? (Also I had to run `apt-get install indent` first, but >> then I hit the missing XORG thing error.) > > The server-side generated files have fallen out of maintenance, > unfortunately. You can ignore that for now. Thanks; I can't test it, but here's a patch for what should go in after dispatch gets regenerated...
> > The new patch series looks good. I'll apply them here later and run some > tests. > > I'd also like to see a new piglit test for this extension. In fact, I > think we should require a piglit test for any new feature we add to > Mesa. Sure. It looks like we're halfway there already, actually: http://cgit.freedesktop.org/piglit/tree/tests/spec/arb_robustness/ > > -Brian > >
From 48a1bfe98d91a57f37ec1bae008d02d86915c02f Mon Sep 17 00:00:00 2001 From: nobled <nob...@dreamwidth.org> Date: Wed, 20 Apr 2011 19:11:53 +0000 Subject: [PATCH] mesa: hook up GL_ARB_robustness dispatch functions ...and advertise the extension. --- src/mesa/main/api_exec.c | 9 +++++++++ src/mesa/main/colortab.c | 3 +++ src/mesa/main/convolve.c | 4 ++++ src/mesa/main/eval.c | 5 +++++ src/mesa/main/extensions.c | 2 +- src/mesa/main/histogram.c | 4 ++++ src/mesa/main/pixel.c | 5 +++++ src/mesa/main/uniforms.c | 5 +++++ 8 files changed, 36 insertions(+), 1 deletions(-) diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index d0298df..93214dd 100644 --- a/src/mesa/main/api_exec.c +++ b/src/mesa/main/api_exec.c @@ -502,6 +502,9 @@ _mesa_create_exec_table(void) SET_CompressedTexSubImage2DARB(exec, _mesa_CompressedTexSubImage2DARB); SET_CompressedTexSubImage1DARB(exec, _mesa_CompressedTexSubImage1DARB); SET_GetCompressedTexImageARB(exec, _mesa_GetCompressedTexImageARB); + + /* ARB 104. GL_ARB_robustness */ + SET_GetnCompressedTexImageARB(exec, _mesa_GetnCompressedTexImageARB); #endif /* ARB 14. GL_ARB_point_parameters */ @@ -597,6 +600,12 @@ _mesa_create_exec_table(void) SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB); #endif + /* ARB 104. GL_ARB_robustness */ + SET_GetGraphicsResetStatusARB(exec, _mesa_GetGraphicsResetStatusARB); + SET_GetnPolygonStippleARB(exec, _mesa_GetnPolygonStippleARB); + SET_GetnTexImageARB(exec, _mesa_GetnTexImageARB); + SET_ReadnPixelsARB(exec, _mesa_ReadnPixelsARB); + /* GL_ARB_sync */ _mesa_init_sync_dispatch(exec); diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c index e3a77d8..be9961a 100644 --- a/src/mesa/main/colortab.c +++ b/src/mesa/main/colortab.c @@ -797,6 +797,9 @@ _mesa_init_colortable_dispatch(struct _glapi_table *disp) SET_GetColorTable(disp, _mesa_GetColorTable); SET_GetColorTableParameterfv(disp, _mesa_GetColorTableParameterfv); SET_GetColorTableParameteriv(disp, _mesa_GetColorTableParameteriv); + + /* GL_ARB_robustness */ + SET_GetnColorTableARB(exec, _mesa_GetnColorTableARB); } diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c index d5b3d5b..74f28da 100644 --- a/src/mesa/main/convolve.c +++ b/src/mesa/main/convolve.c @@ -195,6 +195,10 @@ _mesa_init_convolve_dispatch(struct _glapi_table *disp) SET_GetConvolutionParameteriv(disp, _mesa_GetConvolutionParameteriv); SET_SeparableFilter2D(disp, _mesa_SeparableFilter2D); SET_GetSeparableFilter(disp, _mesa_GetSeparableFilter); + + /* GL_ARB_robustness */ + SET_GetnConvolutionFilterARB(disp, _mesa_GetnConvolutionFilterARB); + SET_GetnSeparableFilterARB(disp, _mesa_GetnSeparableFilterARB); } diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c index 9eb4f67..e651715 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -916,6 +916,11 @@ _mesa_init_eval_dispatch(struct _glapi_table *disp) SET_MapGrid1f(disp, _mesa_MapGrid1f); SET_MapGrid2d(disp, _mesa_MapGrid2d); SET_MapGrid2f(disp, _mesa_MapGrid2f); + + /* GL_ARB_robustness */ + SET_GetnMapdvARB(disp, _mesa_GetnMapdvARB); + SET_GetnMapfvARB(disp, _mesa_GetnMapfvARB); + SET_GetnMapivARB(disp, _mesa_GetnMapivARB); } diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index b7ba7ed..82474cf 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -107,7 +107,7 @@ static const struct extension extension_table[] = { { "GL_ARB_point_parameters", o(EXT_point_parameters), GL, 1997 }, { "GL_ARB_point_sprite", o(ARB_point_sprite), GL, 2003 }, { "GL_ARB_provoking_vertex", o(EXT_provoking_vertex), GL, 2009 }, - { "GL_ARB_robustness", o(dummy_false), GL, 2010 }, + { "GL_ARB_robustness", o(dummy_true), GL, 2010 }, { "GL_ARB_sampler_objects", o(ARB_sampler_objects), GL, 2009 }, { "GL_ARB_seamless_cube_map", o(ARB_seamless_cube_map), GL, 2009 }, { "GL_ARB_shader_objects", o(ARB_shader_objects), GL, 2002 }, diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c index bc5576d..09e48eb 100644 --- a/src/mesa/main/histogram.c +++ b/src/mesa/main/histogram.c @@ -164,6 +164,10 @@ _mesa_init_histogram_dispatch(struct _glapi_table *disp) SET_Minmax(disp, _mesa_Minmax); SET_ResetHistogram(disp, _mesa_ResetHistogram); SET_ResetMinmax(disp, _mesa_ResetMinmax); + + /* GL_ARB_robustness */ + SET_GetnHistogramARB(exec, _mesa_GetnHistogramARB); + SET_GetnMinmaxARB(exec, _mesa_GetnMinmaxARB); } #endif /* FEATURE_histogram */ diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c index 724b998..7757462 100644 --- a/src/mesa/main/pixel.c +++ b/src/mesa/main/pixel.c @@ -661,6 +661,11 @@ _mesa_init_pixel_dispatch(struct _glapi_table *disp) SET_PixelTransferf(disp, _mesa_PixelTransferf); SET_PixelTransferi(disp, _mesa_PixelTransferi); SET_PixelZoom(disp, _mesa_PixelZoom); + + /* GL_ARB_robustness */ + SET_GetnPixelMapfvARB(disp, _mesa_GetnPixelMapfvARB); + SET_GetnPixelMapuivARB(disp, _mesa_GetnPixelMapuivARB); + SET_GetnPixelMapusvARB(disp, _mesa_GetnPixelMapusvARB); } diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 1ad5e0a..12fe7b5 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -1527,6 +1527,11 @@ _mesa_init_shader_uniform_dispatch(struct _glapi_table *exec) SET_Uniform4uivEXT(exec, _mesa_Uniform4uiv); SET_GetUniformuivEXT(exec, _mesa_GetUniformuiv); + /* GL_ARB_robustness */ + SET_GetnUniformfvARB(exec, _mesa_GetnUniformfvARB); + SET_GetnUniformivARB(exec, _mesa_GetnUniformivARB); + SET_GetnUniformuivARB(exec, _mesa_GetnUniformuivARB); + SET_GetnUniformdvARB(exec, _mesa_GetnUniformdvARB); /* GL 4.0 */ #endif /* FEATURE_GL */ } -- 1.7.0.4
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev