projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: don't always enable OES_standard_derivatives
[mesa.git]
/
src
/
mesa
/
vbo
/
vbo_context.c
diff --git
a/src/mesa/vbo/vbo_context.c
b/src/mesa/vbo/vbo_context.c
index e3be39a342e134255a4fac96e9b758e6b7a20b0b..fd15fb6a9c30370e9c882ddc2e355f3dd1729c94 100644
(file)
--- a/
src/mesa/vbo/vbo_context.c
+++ b/
src/mesa/vbo/vbo_context.c
@@
-33,13
+33,8
@@
#include "vbo.h"
#include "vbo_context.h"
#include "vbo.h"
#include "vbo_context.h"
-
-
-#define NR_LEGACY_ATTRIBS 16
-#define NR_GENERIC_ATTRIBS 16
#define NR_MAT_ATTRIBS 12
#define NR_MAT_ATTRIBS 12
-
static GLuint check_size( const GLfloat *attr )
{
if (attr[3] != 1.0) return 4;
static GLuint check_size( const GLfloat *attr )
{
if (attr[3] != 1.0) return 4;
@@
-49,18
+44,18
@@
static GLuint check_size( const GLfloat *attr )
}
}
-static void init_legacy_currval(
GL
context *ctx)
+static void init_legacy_currval(
struct gl_
context *ctx)
{
struct vbo_context *vbo = vbo_context(ctx);
{
struct vbo_context *vbo = vbo_context(ctx);
- struct gl_client_array *arrays =
vbo->legacy_currval
;
+ struct gl_client_array *arrays =
&vbo->currval[VBO_ATTRIB_POS]
;
GLuint i;
GLuint i;
- memset(arrays, 0, sizeof(*arrays) *
NR_LEGACY_ATTRIBS
);
+ memset(arrays, 0, sizeof(*arrays) *
VERT_ATTRIB_FF_MAX
);
/* Set up a constant (StrideB == 0) array for each current
* attribute:
*/
/* Set up a constant (StrideB == 0) array for each current
* attribute:
*/
- for (i = 0; i <
NR_LEGACY_ATTRIBS
; i++) {
+ for (i = 0; i <
VERT_ATTRIB_FF_MAX
; i++) {
struct gl_client_array *cl = &arrays[i];
/* Size will have to be determined at runtime:
struct gl_client_array *cl = &arrays[i];
/* Size will have to be determined at runtime:
@@
-72,21
+67,22
@@
static void init_legacy_currval(GLcontext *ctx)
cl->Type = GL_FLOAT;
cl->Format = GL_RGBA;
cl->Ptr = (const void *)ctx->Current.Attrib[i];
cl->Type = GL_FLOAT;
cl->Format = GL_RGBA;
cl->Ptr = (const void *)ctx->Current.Attrib[i];
+ cl->_ElementSize = cl->Size * sizeof(GLfloat);
_mesa_reference_buffer_object(ctx, &cl->BufferObj,
ctx->Shared->NullBufferObj);
}
}
_mesa_reference_buffer_object(ctx, &cl->BufferObj,
ctx->Shared->NullBufferObj);
}
}
-static void init_generic_currval(
GL
context *ctx)
+static void init_generic_currval(
struct gl_
context *ctx)
{
struct vbo_context *vbo = vbo_context(ctx);
{
struct vbo_context *vbo = vbo_context(ctx);
- struct gl_client_array *arrays =
vbo->generic_currval
;
+ struct gl_client_array *arrays =
&vbo->currval[VBO_ATTRIB_GENERIC0]
;
GLuint i;
GLuint i;
- memset(arrays, 0, sizeof(*arrays) *
NR_GENERIC_ATTRIBS
);
+ memset(arrays, 0, sizeof(*arrays) *
VERT_ATTRIB_GENERIC_MAX
);
- for (i = 0; i <
NR_GENERIC_ATTRIBS
; i++) {
+ for (i = 0; i <
VERT_ATTRIB_GENERIC_MAX
; i++) {
struct gl_client_array *cl = &arrays[i];
/* This will have to be determined at runtime:
struct gl_client_array *cl = &arrays[i];
/* This will have to be determined at runtime:
@@
-98,16
+94,18
@@
static void init_generic_currval(GLcontext *ctx)
cl->Stride = 0;
cl->StrideB = 0;
cl->Enabled = 1;
cl->Stride = 0;
cl->StrideB = 0;
cl->Enabled = 1;
+ cl->_ElementSize = cl->Size * sizeof(GLfloat);
_mesa_reference_buffer_object(ctx, &cl->BufferObj,
ctx->Shared->NullBufferObj);
}
}
_mesa_reference_buffer_object(ctx, &cl->BufferObj,
ctx->Shared->NullBufferObj);
}
}
-static void init_mat_currval(
GL
context *ctx)
+static void init_mat_currval(
struct gl_
context *ctx)
{
struct vbo_context *vbo = vbo_context(ctx);
{
struct vbo_context *vbo = vbo_context(ctx);
- struct gl_client_array *arrays = vbo->mat_currval;
+ struct gl_client_array *arrays =
+ &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT];
GLuint i;
ASSERT(NR_MAT_ATTRIBS == MAT_ATTRIB_MAX);
GLuint i;
ASSERT(NR_MAT_ATTRIBS == MAT_ATTRIB_MAX);
@@
-143,13
+141,14
@@
static void init_mat_currval(GLcontext *ctx)
cl->Stride = 0;
cl->StrideB = 0;
cl->Enabled = 1;
cl->Stride = 0;
cl->StrideB = 0;
cl->Enabled = 1;
+ cl->_ElementSize = cl->Size * sizeof(GLfloat);
_mesa_reference_buffer_object(ctx, &cl->BufferObj,
ctx->Shared->NullBufferObj);
}
}
_mesa_reference_buffer_object(ctx, &cl->BufferObj,
ctx->Shared->NullBufferObj);
}
}
-GLboolean _vbo_CreateContext(
GL
context *ctx )
+GLboolean _vbo_CreateContext(
struct gl_
context *ctx )
{
struct vbo_context *vbo = CALLOC_STRUCT(vbo_context);
{
struct vbo_context *vbo = CALLOC_STRUCT(vbo_context);
@@
-162,12
+161,6
@@
GLboolean _vbo_CreateContext( GLcontext *ctx )
return GL_FALSE;
}
return GL_FALSE;
}
- /* TODO: remove these pointers.
- */
- vbo->legacy_currval = &vbo->currval[VBO_ATTRIB_POS];
- vbo->generic_currval = &vbo->currval[VBO_ATTRIB_GENERIC0];
- vbo->mat_currval = &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT];
-
init_legacy_currval( ctx );
init_generic_currval( ctx );
init_mat_currval( ctx );
init_legacy_currval( ctx );
init_generic_currval( ctx );
init_mat_currval( ctx );
@@
-178,16
+171,14
@@
GLboolean _vbo_CreateContext( GLcontext *ctx )
{
GLuint i;
{
GLuint i;
- /* When no vertex program, pull in the material attributes in
- * the 16..32 generic range.
- */
- for (i = 0; i < 16; i++)
+ /* identity mapping */
+ for (i = 0; i < Elements(vbo->map_vp_none); i++)
vbo->map_vp_none[i] = i;
vbo->map_vp_none[i] = i;
- for (i = 0; i < 12; i++)
- vbo->map_vp_none[16+i] = VBO_ATTRIB_MAT_FRONT_AMBIENT + i;
- for (i = 0; i < 4; i++)
- vbo->map_vp_none[28+i] = i;
-
+ /* map material attribs to generic slots */
+ for (i = 0; i < NR_MAT_ATTRIBS; i++)
+ vbo->map_vp_none[VERT_ATTRIB_GENERIC(i)]
+ = VBO_ATTRIB_MAT_FRONT_AMBIENT + i;
+
for (i = 0; i < Elements(vbo->map_vp_arb); i++)
vbo->map_vp_arb[i] = i;
}
for (i = 0; i < Elements(vbo->map_vp_arb); i++)
vbo->map_vp_arb[i] = i;
}
@@
-198,9
+189,8
@@
GLboolean _vbo_CreateContext( GLcontext *ctx )
* vtxfmt mechanism can be removed now.
*/
vbo_exec_init( ctx );
* vtxfmt mechanism can be removed now.
*/
vbo_exec_init( ctx );
-#if FEATURE_dlist
- vbo_save_init( ctx );
-#endif
+ if (ctx->API == API_OPENGL)
+ vbo_save_init( ctx );
_math_init_eval();
_math_init_eval();
@@
-208,14
+198,13
@@
GLboolean _vbo_CreateContext( GLcontext *ctx )
}
}
-void _vbo_InvalidateState(
GL
context *ctx, GLuint new_state )
+void _vbo_InvalidateState(
struct gl_
context *ctx, GLuint new_state )
{
{
- _ae_invalidate_state(ctx, new_state);
vbo_exec_invalidate_state(ctx, new_state);
}
vbo_exec_invalidate_state(ctx, new_state);
}
-void _vbo_DestroyContext(
GL
context *ctx )
+void _vbo_DestroyContext(
struct gl_
context *ctx )
{
struct vbo_context *vbo = vbo_context(ctx);
{
struct vbo_context *vbo = vbo_context(ctx);
@@
-232,16
+221,15
@@
void _vbo_DestroyContext( GLcontext *ctx )
}
vbo_exec_destroy(ctx);
}
vbo_exec_destroy(ctx);
-#if FEATURE_dlist
- vbo_save_destroy(ctx);
-#endif
- FREE(vbo);
+ if (ctx->API == API_OPENGL)
+ vbo_save_destroy(ctx);
+ free(vbo);
ctx->swtnl_im = NULL;
}
}
ctx->swtnl_im = NULL;
}
}
-void vbo_set_draw_func(
GL
context *ctx, vbo_draw_func func)
+void vbo_set_draw_func(
struct gl_
context *ctx, vbo_draw_func func)
{
struct vbo_context *vbo = vbo_context(ctx);
vbo->draw_prims = func;
{
struct vbo_context *vbo = vbo_context(ctx);
vbo->draw_prims = func;