diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-18 16:33:08 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-04-11 11:13:36 +0200 |
| commit | accd8a3364ffd1e91a4ab52b06b5e3b9d250ae92 (patch) | |
| tree | de6631463ba227bb7e08b9ff7ab0458925e75f15 /mesalib/src/mesa/main/context.c | |
| parent | a2ce004b2966da2fe0249e72e2fb99255cef3092 (diff) | |
| download | vcxsrv-accd8a3364ffd1e91a4ab52b06b5e3b9d250ae92.tar.gz vcxsrv-accd8a3364ffd1e91a4ab52b06b5e3b9d250ae92.tar.bz2 vcxsrv-accd8a3364ffd1e91a4ab52b06b5e3b9d250ae92.zip | |
libX11 mesa git update 18 Mar 2013
libX11 commit f49bb2dd6d4ea45c55bd21acc0efe2b764441020
mesa commit 2da8ee16a8b126d15f34552916c77b203be326db
Diffstat (limited to 'mesalib/src/mesa/main/context.c')
| -rw-r--r-- | mesalib/src/mesa/main/context.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index cdcf7adfa..053993421 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -344,23 +344,17 @@ dummy_enum_func(void) { gl_buffer_index bi = BUFFER_FRONT_LEFT; gl_face_index fi = FACE_POS_X; - gl_frag_attrib fa = FRAG_ATTRIB_WPOS; gl_frag_result fr = FRAG_RESULT_DEPTH; gl_texture_index ti = TEXTURE_2D_ARRAY_INDEX; gl_vert_attrib va = VERT_ATTRIB_POS; - gl_vert_result vr = VERT_RESULT_HPOS; - gl_geom_attrib ga = GEOM_ATTRIB_POSITION; - gl_geom_result gr = GEOM_RESULT_POS; + gl_varying_slot vs = VARYING_SLOT_POS; (void) bi; (void) fi; - (void) fa; (void) fr; (void) ti; (void) va; - (void) vr; - (void) ga; - (void) gr; + (void) vs; } @@ -410,7 +404,7 @@ one_time_init( struct gl_context *ctx ) #if defined(DEBUG) && defined(__DATE__) && defined(__TIME__) if (MESA_VERBOSE != 0) { _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n", - MESA_VERSION_STRING, __DATE__, __TIME__); + PACKAGE_VERSION, __DATE__, __TIME__); } #endif @@ -677,9 +671,9 @@ static void check_context_limits(struct gl_context *ctx) { /* check that we don't exceed the size of various bitfields */ - assert(VERT_RESULT_MAX <= + assert(VARYING_SLOT_MAX <= (8 * sizeof(ctx->VertexProgram._Current->Base.OutputsWritten))); - assert(FRAG_ATTRIB_MAX <= + assert(VARYING_SLOT_MAX <= (8 * sizeof(ctx->FragmentProgram._Current->Base.InputsRead))); assert(MAX_COMBINED_TEXTURE_IMAGE_UNITS <= 8 * sizeof(GLbitfield)); |