projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into gallium_draw_llvm
[mesa.git]
/
src
/
mesa
/
main
/
api_arrayelt.c
diff --git
a/src/mesa/main/api_arrayelt.c
b/src/mesa/main/api_arrayelt.c
index 2462a1b003765cc98ef024ccab8e84c239f33407..ffcd194240f37bc2f042ca11a44dbaf54bb366c1 100644
(file)
--- a/
src/mesa/main/api_arrayelt.c
+++ b/
src/mesa/main/api_arrayelt.c
@@
-32,8
+32,7
@@
#include "context.h"
#include "imports.h"
#include "macros.h"
#include "context.h"
#include "imports.h"
#include "macros.h"
-#include "glapi/glapioffsets.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
typedef void (GLAPIENTRY *array_func)( const void * );
typedef void (GLAPIENTRY *array_func)( const void * );
@@
-71,6
+70,10
@@
typedef struct {
*/
#define TYPE_IDX(t) ( (t) == GL_DOUBLE ? 7 : (t) & 7 )
*/
#define TYPE_IDX(t) ( (t) == GL_DOUBLE ? 7 : (t) & 7 )
+
+#if FEATURE_arrayelt
+
+
static const int ColorFuncs[2][8] = {
{
_gloffset_Color3bv,
static const int ColorFuncs[2][8] = {
{
_gloffset_Color3bv,
@@
-1160,7
+1163,7
@@
static void _ae_update_state( GLcontext *ctx )
at->array = attribArray;
/* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV
* function pointer here (for float arrays) since the pointer may
at->array = attribArray;
/* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV
* function pointer here (for float arrays) since the pointer may
- * change from one execution of _ae_
loopback_array_el
t() to
+ * change from one execution of _ae_
ArrayElemen
t() to
* the next. Doing so caused UT to break.
*/
if (ctx->VertexProgram._Enabled
* the next. Doing so caused UT to break.
*/
if (ctx->VertexProgram._Enabled
@@
-1254,7
+1257,7
@@
void _ae_unmap_vbos( GLcontext *ctx )
* for all enabled vertex arrays (for elt-th element).
* Note: this may be called during display list construction.
*/
* for all enabled vertex arrays (for elt-th element).
* Note: this may be called during display list construction.
*/
-void GLAPIENTRY _ae_
loopback_array_el
t( GLint elt )
+void GLAPIENTRY _ae_
ArrayElemen
t( GLint elt )
{
GET_CURRENT_CONTEXT(ctx);
const AEcontext *actx = AE_CONTEXT(ctx);
{
GET_CURRENT_CONTEXT(ctx);
const AEcontext *actx = AE_CONTEXT(ctx);
@@
-1317,3
+1320,13
@@
void _ae_invalidate_state( GLcontext *ctx, GLuint new_state )
actx->NewState |= new_state;
}
}
actx->NewState |= new_state;
}
}
+
+
+void _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
+ const GLvertexformat *vfmt)
+{
+ SET_ArrayElement(disp, vfmt->ArrayElement);
+}
+
+
+#endif /* FEATURE_arrayelt */