1 Oct
2013
1 Oct
'13
7:43 p.m.
Author: jgardou
Date: Tue Oct 1 19:43:16 2013
New Revision: 60504
URL: http://svn.reactos.org/svn/reactos?rev=60504&view=rev
Log:
[[MESA]
- leaner build part 5 of X
- Fix build from part 4 (damn you tortoiseSVN)
- Get rid of the ARB_instanced_arrays extension
Modified:
trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c
trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h
trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c
trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c
trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h
trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c
trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h
trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c
Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c [iso-8859-1] Tue Oct 1
19:43:16 2013
@@ -691,9 +691,6 @@
SET_GetStringi(exec, _mesa_GetStringi);
SET_ClampColor(exec, _mesa_ClampColorARB);
- /* GL_ARB_instanced_arrays */
- SET_VertexAttribDivisorARB(exec, _mesa_VertexAttribDivisor);
-
/* GL_ARB_draw_buffer_blend */
SET_BlendFunciARB(exec, _mesa_BlendFunci);
SET_BlendFuncSeparateiARB(exec, _mesa_BlendFuncSeparatei);
Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h [iso-8859-1] Tue Oct 1
19:43:16 2013
@@ -508,7 +508,6 @@
#define _gloffset_FramebufferTexture 437
#define _gloffset_GetBufferParameteri64v 438
#define _gloffset_GetInteger64i_v 439
-#define _gloffset_VertexAttribDivisor 440
#define _gloffset_LoadTransposeMatrixdARB 441
#define _gloffset_LoadTransposeMatrixfARB 442
#define _gloffset_MultTransposeMatrixdARB 443
@@ -639,7 +638,6 @@
#define _gloffset_FramebufferTextureARB 576
#define _gloffset_FramebufferTextureFaceARB 577
#define _gloffset_ProgramParameteriARB 578
-#define _gloffset_VertexAttribDivisorARB 579
#define _gloffset_FlushMappedBufferRange 580
#define _gloffset_MapBufferRange 581
#define _gloffset_TexBufferARB 582
@@ -1435,7 +1433,6 @@
#define _gloffset_FramebufferTexture
driDispatchRemapTable[FramebufferTexture_remap_index]
#define _gloffset_GetBufferParameteri64v
driDispatchRemapTable[GetBufferParameteri64v_remap_index]
#define _gloffset_GetInteger64i_v driDispatchRemapTable[GetInteger64i_v_remap_index]
-#define _gloffset_VertexAttribDivisor
driDispatchRemapTable[VertexAttribDivisor_remap_index]
#define _gloffset_LoadTransposeMatrixdARB
driDispatchRemapTable[LoadTransposeMatrixdARB_remap_index]
#define _gloffset_LoadTransposeMatrixfARB
driDispatchRemapTable[LoadTransposeMatrixfARB_remap_index]
#define _gloffset_MultTransposeMatrixdARB
driDispatchRemapTable[MultTransposeMatrixdARB_remap_index]
@@ -1566,7 +1563,6 @@
#define _gloffset_FramebufferTextureARB
driDispatchRemapTable[FramebufferTextureARB_remap_index]
#define _gloffset_FramebufferTextureFaceARB
driDispatchRemapTable[FramebufferTextureFaceARB_remap_index]
#define _gloffset_ProgramParameteriARB
driDispatchRemapTable[ProgramParameteriARB_remap_index]
-#define _gloffset_VertexAttribDivisorARB
driDispatchRemapTable[VertexAttribDivisorARB_remap_index]
#define _gloffset_FlushMappedBufferRange
driDispatchRemapTable[FlushMappedBufferRange_remap_index]
#define _gloffset_MapBufferRange driDispatchRemapTable[MapBufferRange_remap_index]
#define _gloffset_TexBufferARB driDispatchRemapTable[TexBufferARB_remap_index]
@@ -6706,17 +6702,6 @@
SET_by_offset(disp, _gloffset_GetInteger64i_v, fn);
}
-typedef void (GLAPIENTRYP _glptr_VertexAttribDivisor)(GLuint, GLuint);
-#define CALL_VertexAttribDivisor(disp, parameters) \
- (* GET_VertexAttribDivisor(disp)) parameters
-static inline _glptr_VertexAttribDivisor GET_VertexAttribDivisor(struct _glapi_table
*disp) {
- return (_glptr_VertexAttribDivisor) (GET_by_offset(disp,
_gloffset_VertexAttribDivisor));
-}
-
-static inline void SET_VertexAttribDivisor(struct _glapi_table *disp, void (GLAPIENTRYP
fn)(GLuint, GLuint)) {
- SET_by_offset(disp, _gloffset_VertexAttribDivisor, fn);
-}
-
typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixdARB)(const GLdouble *);
#define CALL_LoadTransposeMatrixdARB(disp, parameters) \
(* GET_LoadTransposeMatrixdARB(disp)) parameters
@@ -8147,17 +8132,6 @@
SET_by_offset(disp, _gloffset_ProgramParameteriARB, fn);
}
-typedef void (GLAPIENTRYP _glptr_VertexAttribDivisorARB)(GLuint, GLuint);
-#define CALL_VertexAttribDivisorARB(disp, parameters) \
- (* GET_VertexAttribDivisorARB(disp)) parameters
-static inline _glptr_VertexAttribDivisorARB GET_VertexAttribDivisorARB(struct
_glapi_table *disp) {
- return (_glptr_VertexAttribDivisorARB) (GET_by_offset(disp,
_gloffset_VertexAttribDivisorARB));
-}
-
-static inline void SET_VertexAttribDivisorARB(struct _glapi_table *disp, void
(GLAPIENTRYP fn)(GLuint, GLuint)) {
- SET_by_offset(disp, _gloffset_VertexAttribDivisorARB, fn);
-}
-
typedef void (GLAPIENTRYP _glptr_FlushMappedBufferRange)(GLenum, GLintptr, GLsizeiptr);
#define CALL_FlushMappedBufferRange(disp, parameters) \
(* GET_FlushMappedBufferRange(disp)) parameters
Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c [iso-8859-1] Tue Oct 1 19:43:16
2013
@@ -418,9 +418,6 @@
OPCODE_ACTIVE_PROGRAM_EXT,
OPCODE_USE_SHADER_PROGRAM_EXT,
- /* GL_ARB_instanced_arrays */
- OPCODE_VERTEX_ATTRIB_DIVISOR,
-
/* GL_NV_texture_barrier */
OPCODE_TEXTURE_BARRIER_NV,
@@ -6886,24 +6883,6 @@
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
CALL_GetTexParameterIuivEXT(ctx->Exec, (target, pname, params));
-}
-
-
-/* GL_ARB_instanced_arrays */
-static void GLAPIENTRY
-save_VertexAttribDivisor(GLuint index, GLuint divisor)
-{
- GET_CURRENT_CONTEXT(ctx);
- Node *n;
- ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
- n = alloc_instruction(ctx, OPCODE_VERTEX_ATTRIB_DIVISOR, 2);
- if (n) {
- n[1].ui = index;
- n[2].ui = divisor;
- }
- if (ctx->ExecuteFlag) {
- CALL_VertexAttribDivisorARB(ctx->Exec, (index, divisor));
- }
}
@@ -8111,11 +8090,6 @@
params[3] = n[6].ui;
CALL_TexParameterIuivEXT(ctx->Exec, (n[1].e, n[2].e, params));
}
- break;
-
- case OPCODE_VERTEX_ATTRIB_DIVISOR:
- /* GL_ARB_instanced_arrays */
- CALL_VertexAttribDivisorARB(ctx->Exec, (n[1].ui, n[2].ui));
break;
case OPCODE_TEXTURE_BARRIER_NV:
@@ -9803,9 +9777,6 @@
(void) save_Uniform4uiv;
#endif
- /* GL_ARB_instanced_arrays */
- SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor);
-
/* GL_NV_texture_barrier */
SET_TextureBarrierNV(table, save_TextureBarrierNV);
Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c [iso-8859-1] Tue Oct 1
19:43:16 2013
@@ -97,7 +97,6 @@
{ "GL_ARB_framebuffer_sRGB", o(EXT_framebuffer_sRGB),
GL, 1998 },
{ "GL_ARB_half_float_pixel", o(ARB_half_float_pixel),
GL, 2003 },
{ "GL_ARB_half_float_vertex", o(ARB_half_float_vertex),
GL, 2008 },
- { "GL_ARB_instanced_arrays", o(ARB_instanced_arrays),
GL, 2008 },
{ "GL_ARB_map_buffer_range", o(ARB_map_buffer_range),
GL, 2008 },
{ "GL_ARB_multisample", o(dummy_true),
GL, 1994 },
{ "GL_ARB_multitexture", o(dummy_true),
GL, 1998 },
Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h [iso-8859-1] Tue Oct 1 19:43:16
2013
@@ -1579,7 +1579,6 @@
GLboolean Enabled; /**< Enabled flag is a boolean */
GLboolean Normalized; /**< GL_ARB_vertex_program */
GLboolean Integer; /**< Integer-valued? */
- GLuint InstanceDivisor; /**< GL_ARB_instanced_arrays */
GLuint _ElementSize; /**< size of each element in bytes */
struct gl_buffer_object *BufferObj;/**< GL_ARB_vertex_buffer_object */
@@ -1824,54 +1823,6 @@
struct prog_instruction;
struct gl_program_parameter_list;
struct gl_uniform_list;
-
-struct gl_transform_feedback_varying_info {
- char *Name;
- GLenum Type;
- GLint Size;
-};
-
-struct gl_transform_feedback_output {
- unsigned OutputRegister;
- unsigned OutputBuffer;
- unsigned NumComponents;
-
- /** offset (in DWORDs) of this output within the interleaved structure */
- unsigned DstOffset;
-
- /**
- * Offset into the output register of the data to output. For example,
- * if NumComponents is 2 and ComponentOffset is 1, then the data to
- * offset is in the y and z components of the output register.
- */
- unsigned ComponentOffset;
-};
-
-/** Post-link transform feedback info. */
-struct gl_transform_feedback_info {
- unsigned NumOutputs;
-
- /**
- * Number of transform feedback buffers in use by this program.
- */
- unsigned NumBuffers;
-
- struct gl_transform_feedback_output *Outputs;
-
- /** Transform feedback varyings used for the linking of this shader program.
- *
- * Use for glGetTransformFeedbackVarying().
- */
- struct gl_transform_feedback_varying_info *Varyings;
- GLint NumVarying;
-
- /**
- * Total number of components stored in each buffer. This may be used by
- * hardware back-ends to determine the correct stride when interleaving
- * multiple transform feedback outputs in the same buffer.
- */
- unsigned BufferStride[MAX_FEEDBACK_ATTRIBS];
-};
/**
* Base class for any kind of program object
@@ -2070,100 +2021,6 @@
struct gl_program_cache *Cache;
};
-
-/**
- * ATI_fragment_shader runtime state
- */
-#define ATI_FS_INPUT_PRIMARY 0
-#define ATI_FS_INPUT_SECONDARY 1
-
-struct atifs_instruction;
-struct atifs_setupinst;
-
-/**
- * ATI fragment shader
- */
-struct ati_fragment_shader
-{
- GLuint Id;
- GLint RefCount;
- struct atifs_instruction *Instructions[2];
- struct atifs_setupinst *SetupInst[2];
- GLfloat Constants[8][4];
- GLbitfield LocalConstDef; /**< Indicates which constants have been set */
- GLubyte numArithInstr[2];
- GLubyte regsAssigned[2];
- GLubyte NumPasses; /**< 1 or 2 */
- GLubyte cur_pass;
- GLubyte last_optype;
- GLboolean interpinp1;
- GLboolean isValid;
- GLuint swizzlerq;
-};
-
-/**
- * Context state for GL_ATI_fragment_shader
- */
-struct gl_ati_fragment_shader_state
-{
- GLboolean Enabled;
- GLboolean _Enabled; /**< enabled and valid shader? */
- GLboolean Compiling;
- GLfloat GlobalConstants[8][4];
- struct ati_fragment_shader *Current;
-};
-
-
-/**
- * Occlusion/timer query object.
- */
-struct gl_query_object
-{
- GLenum Target; /**< The query target, when active */
- GLuint Id; /**< hash table ID/name */
- GLuint64EXT Result; /**< the counter */
- GLboolean Active; /**< inside Begin/EndQuery */
- GLboolean Ready; /**< result is ready? */
-};
-
-
-/**
- * Context state for query objects.
- */
-struct gl_query_state
-{
- struct _mesa_HashTable *QueryObjects;
- struct gl_query_object *CurrentOcclusionObject; /* GL_ARB_occlusion_query */
-
- /** GL_NV_conditional_render */
- struct gl_query_object *CondRenderQuery;
-
- /** GL_EXT_transform_feedback */
- struct gl_query_object *PrimitivesGenerated;
- struct gl_query_object *PrimitivesWritten;
-
- /** GL_ARB_timer_query */
- struct gl_query_object *TimeElapsed;
-
- GLenum CondRenderMode;
-};
-
-
-/** Sync object state */
-struct gl_sync_object {
- struct simple_node link;
- GLenum Type; /**< GL_SYNC_FENCE */
- GLuint Name; /**< Fence name */
- GLint RefCount; /**< Reference count */
- GLboolean DeletePending; /**< Object was deleted while there were still
- * live references (e.g., sync not yet finished)
- */
- GLenum SyncCondition;
- GLbitfield Flags; /**< Flags passed to glFenceSync */
- GLuint StatusFlag:1; /**< Has the sync object been signaled? */
-};
-
-
/** Set by #pragma directives */
struct gl_sl_pragmas
{
@@ -2262,22 +2119,6 @@
*/
struct string_to_uint_map *FragDataBindings;
- /**
- * Transform feedback varyings last specified by
- * glTransformFeedbackVaryings().
- *
- * For the current set of transform feeedback varyings used for transform
- * feedback output, see LinkedTransformFeedback.
- */
- struct {
- GLenum BufferMode;
- GLuint NumVarying;
- GLchar **VaryingNames; /**< Array [NumVarying] of char * */
- } TransformFeedback;
-
- /** Post-link transform feedback info. */
- struct gl_transform_feedback_info LinkedTransformFeedback;
-
/** Post-link gl_FragDepth layout for ARB_conservative_depth. */
enum gl_frag_depth_layout FragDepthLayout;
@@ -2410,51 +2251,6 @@
};
/**
- * Transform feedback object state
- */
-struct gl_transform_feedback_object
-{
- GLuint Name; /**< AKA the object ID */
- GLint RefCount;
- GLboolean Active; /**< Is transform feedback enabled? */
- GLboolean Paused; /**< Is transform feedback paused? */
- GLboolean EndedAnytime; /**< Has EndTransformFeedback been called
- at least once? */
-
- /** The feedback buffers */
- GLuint BufferNames[MAX_FEEDBACK_ATTRIBS];
- struct gl_buffer_object *Buffers[MAX_FEEDBACK_ATTRIBS];
-
- /** Start of feedback data in dest buffer */
- GLintptr Offset[MAX_FEEDBACK_ATTRIBS];
- /** Max data to put into dest buffer (in bytes) */
- GLsizeiptr Size[MAX_FEEDBACK_ATTRIBS];
-};
-
-
-/**
- * Context state for transform feedback.
- */
-struct gl_transform_feedback
-{
- GLenum Mode; /**< GL_POINTS, GL_LINES or GL_TRIANGLES */
-
- /** The general binding point (GL_TRANSFORM_FEEDBACK_BUFFER) */
- struct gl_buffer_object *CurrentBuffer;
-
- /** The table of all transform feedback objects */
- struct _mesa_HashTable *Objects;
-
- /** The current xform-fb object (GL_TRANSFORM_FEEDBACK_BINDING) */
- struct gl_transform_feedback_object *CurrentObject;
-
- /** The default xform-fb object (Name==0) */
- struct gl_transform_feedback_object *DefaultObject;
-};
-
-
-
-/**
* State which can be shared by multiple contexts:
*/
struct gl_shared_state
@@ -2494,10 +2290,6 @@
struct gl_geometry_program *DefaultGeometryProgram;
/*@}*/
- /* GL_ATI_fragment_shader */
- struct _mesa_HashTable *ATIShaders;
- struct ati_fragment_shader *DefaultFragmentShader;
-
struct _mesa_HashTable *BufferObjects;
/** Table of both gl_shader and gl_shader_program objects */
@@ -2506,9 +2298,6 @@
/* GL_EXT_framebuffer_object */
struct _mesa_HashTable *RenderBuffers;
struct _mesa_HashTable *FrameBuffers;
-
- /* GL_ARB_sync */
- struct simple_node SyncObjects;
void *DriverData; /**< Device driver shared state */
};
@@ -2777,11 +2566,6 @@
/** Which texture units support GL_ATI_envmap_bumpmap as targets */
GLbitfield SupportedBumpUnits;
- /**
- * Maximum amount of time, measured in nanseconds, that the server can wait.
- */
- GLuint64 MaxServerWaitTimeout;
-
/** GL_EXT_provoking_vertex */
GLboolean QuadsFollowProvokingVertexConvention;
@@ -2790,11 +2574,6 @@
/** OpenGL version 3.2 */
GLbitfield ProfileMask; /**< Mask of CONTEXT_x_PROFILE_BIT */
-
- /** GL_EXT_transform_feedback */
- GLuint MaxTransformFeedbackSeparateAttribs;
- GLuint MaxTransformFeedbackSeparateComponents;
- GLuint MaxTransformFeedbackInterleavedComponents;
/** GL_EXT_gpu_shader4 */
GLint MinProgramTexelOffset, MaxProgramTexelOffset;
@@ -2858,17 +2637,13 @@
GLboolean ARB_geometry_shader4;
GLboolean ARB_half_float_pixel;
GLboolean ARB_half_float_vertex;
- GLboolean ARB_instanced_arrays;
GLboolean ARB_map_buffer_range;
- GLboolean ARB_occlusion_query;
- GLboolean ARB_occlusion_query2;
GLboolean ARB_point_sprite;
GLboolean ARB_seamless_cube_map;
GLboolean ARB_shader_objects;
GLboolean ARB_shader_stencil_export;
GLboolean ARB_shader_texture_lod;
GLboolean ARB_shading_language_100;
- GLboolean ARB_sync;
GLboolean ARB_texture_border_clamp;
GLboolean ARB_texture_buffer_object;
GLboolean ARB_texture_compression_rgtc;
@@ -2881,7 +2656,6 @@
GLboolean ARB_texture_non_power_of_two;
GLboolean ARB_texture_rg;
GLboolean ARB_texture_storage;
- GLboolean ARB_transform_feedback2;
GLboolean ARB_transpose_matrix;
GLboolean ARB_uniform_buffer_object;
GLboolean ARB_vertex_array_object;
@@ -2895,7 +2669,6 @@
GLboolean EXT_clip_volume_hint;
GLboolean EXT_compiled_vertex_array;
GLboolean EXT_depth_bounds_test;
- GLboolean EXT_draw_buffers2;
GLboolean EXT_draw_range_elements;
GLboolean EXT_fog_coord;
GLboolean EXT_framebuffer_blit;
@@ -2925,8 +2698,6 @@
GLboolean EXT_texture_mirror_clamp;
GLboolean EXT_texture_snorm;
GLboolean EXT_texture_sRGB;
- GLboolean EXT_transform_feedback;
- GLboolean EXT_timer_query;
GLboolean EXT_vertex_array_bgra;
GLboolean OES_standard_derivatives;
/* vendor extensions */
@@ -2938,7 +2709,6 @@
GLboolean ATI_texture_compression_3dc;
GLboolean ATI_texture_mirror_once;
GLboolean ATI_texture_env_combine3;
- GLboolean ATI_fragment_shader;
GLboolean ATI_separate_stencil;
GLboolean IBM_rasterpos_clip;
GLboolean IBM_multimode_draw_arrays;
@@ -2947,7 +2717,6 @@
GLboolean MESA_ycbcr_texture;
GLboolean MESA_texture_array;
GLboolean NV_blend_square;
- GLboolean NV_conditional_render;
GLboolean NV_fog_distance;
GLboolean NV_fragment_program;
GLboolean NV_fragment_program_option;
@@ -3037,7 +2806,6 @@
#define _NEW_PROGRAM_CONSTANTS (1 << 27)
#define _NEW_BUFFER_OBJECT (1 << 28)
#define _NEW_FRAG_CLAMP (1 << 29)
-#define _NEW_TRANSFORM_FEEDBACK (1 << 30) /**< gl_context::TransformFeedback */
#define _NEW_ALL ~0
/**
@@ -3305,14 +3073,9 @@
struct gl_vertex_program_state VertexProgram;
struct gl_fragment_program_state FragmentProgram;
struct gl_geometry_program_state GeometryProgram;
- struct gl_ati_fragment_shader_state ATIFragmentShader;
struct gl_shader_state Shader; /**< GLSL shader object state */
struct gl_shader_compiler_options ShaderCompilerOptions[MESA_SHADER_TYPES];
-
- struct gl_query_state Query; /**< occlusion, timer queries */
-
- struct gl_transform_feedback TransformFeedback;
struct gl_buffer_object *CopyReadBuffer; /**< GL_ARB_copy_buffer */
struct gl_buffer_object *CopyWriteBuffer; /**< GL_ARB_copy_buffer */
Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c [iso-8859-1] Tue Oct 1 19:43:16
2013
@@ -521,11 +521,6 @@
return array->Integer;
}
goto error;
- case GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB:
- if (ctx->Extensions.ARB_instanced_arrays) {
- return array->InstanceDivisor;
- }
- goto error;
default:
; /* fall-through */
}
@@ -1057,34 +1052,6 @@
}
-/**
- * See GL_ARB_instanced_arrays.
- * Note that the instance divisor only applies to generic arrays, not
- * the legacy vertex arrays.
- */
-void GLAPIENTRY
-_mesa_VertexAttribDivisor(GLuint index, GLuint divisor)
-{
- GET_CURRENT_CONTEXT(ctx);
- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
- if (!ctx->Extensions.ARB_instanced_arrays) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "glVertexAttribDivisor()");
- return;
- }
-
- if (index >= ctx->Const.VertexProgram.MaxAttribs) {
- _mesa_error(ctx, GL_INVALID_ENUM, "glVertexAttribDivisor(index = %u)",
- index);
- return;
- }
-
- ASSERT(VERT_ATTRIB_GENERIC(index) <
Elements(ctx->Array.ArrayObj->VertexAttrib));
-
- ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_GENERIC(index)].InstanceDivisor =
divisor;
-}
-
-
/**
* Copy one client vertex array to another.
@@ -1103,7 +1070,6 @@
dst->Enabled = src->Enabled;
dst->Normalized = src->Normalized;
dst->Integer = src->Integer;
- dst->InstanceDivisor = src->InstanceDivisor;
dst->_ElementSize = src->_ElementSize;
_mesa_reference_buffer_object(ctx, &dst->BufferObj, src->BufferObj);
dst->_MaxElement = src->_MaxElement;
Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h [iso-8859-1] Tue Oct 1 19:43:16
2013
@@ -249,10 +249,6 @@
_mesa_PrimitiveRestartIndex(GLuint index);
-extern void GLAPIENTRY
-_mesa_VertexAttribDivisor(GLuint index, GLuint divisor);
-
-
extern void
_mesa_copy_client_array(struct gl_context *ctx,
struct gl_client_array *dst,
Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c [iso-8859-1] Tue Oct 1 19:43:16
2013
@@ -159,8 +159,7 @@
const GLboolean ver_3_3 = (ver_3_2 &&
ctx->Const.GLSLVersion >= 330 &&
ctx->Extensions.ARB_blend_func_extended &&
- ctx->Extensions.ARB_explicit_attrib_location &&
- ctx->Extensions.ARB_instanced_arrays);
+ ctx->Extensions.ARB_explicit_attrib_location);
if (ver_3_3) {
major = 3;