Mesa (master): 24 new commits
Brian Paul
brianp at kemper.freedesktop.org
Thu May 2 15:08:07 UTC 2013
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcfbf4a19f0372cc3f96729b08537fcd5f0355e5
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:33 2013 -0600
mesa: update comments, simplify code in vtxfmt.c
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5dc0081ade6c423662a3b89be0f433b9b4ec1773
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:33 2013 -0600
mesa: update GLvertexformat comments
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=200e09e393c05706d830667cbf626d1d51c000c4
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:33 2013 -0600
mesa: remove GLvertexformat::EvalMesh1(), EvalMesh2()
See previous commit comments.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f365b2d77e35391283998dbf1311a4aae3cc760
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:33 2013 -0600
mesa: remove GLvertexformat::Rectf()
As with the glDraw* functions, this doesn't have to be in GLvertexformat.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=49993a1a9dc34b78ccd345b91087385917a40138
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:33 2013 -0600
mesa: simplify dispatch for glDraw* functions
Remove all the glDraw* functions from the GLvertexformat structure.
The point of that dispatch struct is to handle all the functions which
dispatch differently depending on whether we're inside glBegin/End.
glDraw* are never allowed inside glBegin/End so we can remove those
entries.
This simplifies the code paths and gets rid of quite a bit of code.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=79679e258b7aa4b1dc672c03795d47456893f881
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:33 2013 -0600
vbo: add new vbo_initialize_exec_dispatch(), vbo_initialize_save_dispatch()
First step in simplifying the vertex array / glDraw dispatch code.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d0102500bdc123984a2cfc95d4f2710f8c90e898
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:33 2013 -0600
mesa: remove _MESA_INIT_EVAL_VTXFMT() macro
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=43b3d3bc25e63e02b0335c3ce165fb40001906ca
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: remove _MESA_INIT_ARRAYELT_VTXFMT() macro
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=95188fd10f9626fa1045911182e8b2f7b951413f
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: remove _MESA_INIT_DLIST_VTXFMT() macro
Just expand the code.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=84e62b735883b10249995c70dd72f3a275953d71
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: change _mesa_inside_dlist_begin_end() to handle PRIM_UNKNOWN
If the currently compiled primitive state is PRIM_UNKNOWN we should
not return true from _mesa_inside_dlist_begin_end(). This lets us
simplify the calls to that function.
Note, the call to _mesa_inside_dlist_begin_end() in vbo_save_EndList()
should have probably been checking for PRIM_UNKNOWN too, but it wasn't.
So there's no code change change.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=daf19f28c6fca130cd3c786cc0763f7f753d9008
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: add names of geometry shader prims in gl_enums.py
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5472ae1fa9fad8f1a2c60f56f2ac2c94bd38f04c
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
vbo: fix initial value of ctx->Driver.CurrentSavePrimitive
This is set during context creation/initialization. We know we're
not inside glBegin/glEnd at this point so use PRIM_OUTSIDE_BEGIN_END.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ecea61e414bf772944aff7d9a0899fe8f68af90a
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
vbo: fix error detection in vbo_save_playback_vertex_list()
The old code didn't make sense. The clause in question did the
same thing as the next else-if clause. If we're already executing
a glBegin/End pair and we're starting a new primitive, that's an
error.
Fixes more failures in piglit gl-1.0-beginend-coverage test.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a07437dc28283d471988e69586c849547894cc3c
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: comments, formatting fixes in dlist code
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e880b7cbf894d10a773f5dcd04535d40f9f5f035
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
vbo: remove redundant vfmt->Begin = _save_Begin assignment
The same assignment appears later in the function.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e7c16997af83c7db9f3a1e565ae01e7684284ca
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: don't install glDraw* functions into the BeginEnd dispatch table
Functions like glDrawArrays, glDrawElements, etc. are illegal between
glBegin/glEnd and should generate GL_INVALID_OPERATION.
Fixes several piglit gl-1.0-beginend-coverage failures.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d6f3ef92d7cdc48c3fee50aac09e33148aec035f
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
vbo: fix parameter validation for saving dlist glDraw* functions
The _save_OBE_DrawArrays/Elements/RangeElements() functions are
called when building a display list and we know we're outside
glBegin/End.
We shouldn't call the normal _mesa_validate_DrawArrays/Elements()
functions here because those functions only work properly in immediate
mode or during dlist execution. At dlist compile time, we can't call
_mesa_update_state(), etc. and examine the current state since it won't
apply when the list is executed later.
Fixes several failures in piglit's gl-1.0-beginend-coverage test.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=94c7caf406debc0d35153267f491e30a203f9a72
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: add missing error check in _mesa_EndList()
If we're in GL_COMPILE_AND_EXECUTE mode and inside glBegin, calling
glEndList() should generate an error.
Fixes a failure in piglit's gl-1.0-beginend-coverage test.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1a5c5c13d838309cf88664edf159e6086408f28
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: remove unused PRIM_INSIDE_UNKNOWN_PRIM constant
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d5bdce1142d23e68404487e107532fd8dd545b1a
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: simplify save_Begin() error checking
The old code was hard to understand and not entirely correct.
Note that PRIM_INSIDE_UNKNOWN_PRIM is no longer set anywhere so
we'll be able to remove that next.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb459f6295736d55ab5855d7b19e5e49aaf9af41
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: refactor _mesa_valid_prim_mode()
...in terms of new _mesa_is_valid_prim_mode(). We need a mode validater
function that doesn't depend on current state for the display list code.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8be093e2f6301ff9c2728b8a24c83b401e80f070
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: fix CurrentSavePrimitive <= GL_POLYGON tests
Use the new PRIM_MAX value instead so that new geometry shader primitive
types are accounted for.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cce6e30613f8a7c28c83a5e0411689d6184cbf8f
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: adjust PRIM_x constants for geometry shaders
These values pertain to display lists, and the new types of geometry
shader primitives can be used in display lists.
And add new PRIM_MAX constant for follow-on changes.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa782f260d09bbc10db039340358b3518e8a5a38
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 1 19:15:32 2013 -0600
mesa: fix save_ShadeModel() logic and add new comments
This removes the test for _mesa_inside_dlist_begin_end().
If ctx->Driver.CurrentSavePrimitive==PRIM_UNKNOWN (the initial value),
_mesa_inside_dlist_begin_end() will, confusingly, return TRUE.
So we didn't set the ctx->ListState.Current.ShadeModel value and it
remained in its indeterminate state.
This didn't effect correctness, but it defeated the intended optimization
of dropping redundant glShadeModel() state changes in order to
coalesce sequences of drawing commands.
Verified with new piglit gl-1.0-dlist-shademodel test.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
More information about the mesa-commit
mailing list