ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MESA]

Browse Source 
- leaner build part 2 of X
 - Get rid of EXT_texture_swizzle and ARB_vertex_type_2_10_10_10_rev extensions

svn path=/trunk/; revision=60490
This commit is contained in:
Jérôme Gardou
2013-10-01 14:39:31 +00:00
parent 2a926c6b3a
commit 46d9716859
15 changed files with 10 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/opengl/mesa/src/mesa/main/dd.h
-64
View File
@@ -1047,70 +1047,6 @@ typedef struct {
void (GLAPIENTRYP VertexAttribI3uiv)( GLuint index, const GLuint *v);
void (GLAPIENTRYP VertexAttribI4uiv)( GLuint index, const GLuint *v);
/* GL_ARB_vertex_type_10_10_10_2_rev / GL3.3 */
void (GLAPIENTRYP VertexP2ui)( GLenum type, GLuint value );
void (GLAPIENTRYP VertexP2uiv)( GLenum type, const GLuint *value);
void (GLAPIENTRYP VertexP3ui)( GLenum type, GLuint value );
void (GLAPIENTRYP VertexP3uiv)( GLenum type, const GLuint *value);
void (GLAPIENTRYP VertexP4ui)( GLenum type, GLuint value );
void (GLAPIENTRYP VertexP4uiv)( GLenum type, const GLuint *value);
void (GLAPIENTRYP TexCoordP1ui)( GLenum type, GLuint coords );
void (GLAPIENTRYP TexCoordP1uiv)( GLenum type, const GLuint *coords );
void (GLAPIENTRYP TexCoordP2ui)( GLenum type, GLuint coords );
void (GLAPIENTRYP TexCoordP2uiv)( GLenum type, const GLuint *coords );
void (GLAPIENTRYP TexCoordP3ui)( GLenum type, GLuint coords );
void (GLAPIENTRYP TexCoordP3uiv)( GLenum type, const GLuint *coords );
void (GLAPIENTRYP TexCoordP4ui)( GLenum type, GLuint coords );
void (GLAPIENTRYP TexCoordP4uiv)( GLenum type, const GLuint *coords );
void (GLAPIENTRYP MultiTexCoordP1ui)( GLenum texture, GLenum type, GLuint coords );
void (GLAPIENTRYP MultiTexCoordP1uiv)( GLenum texture, GLenum type, const GLuint *coords );
void (GLAPIENTRYP MultiTexCoordP2ui)( GLenum texture, GLenum type, GLuint coords );
void (GLAPIENTRYP MultiTexCoordP2uiv)( GLenum texture, GLenum type, const GLuint *coords );
void (GLAPIENTRYP MultiTexCoordP3ui)( GLenum texture, GLenum type, GLuint coords );
void (GLAPIENTRYP MultiTexCoordP3uiv)( GLenum texture, GLenum type, const GLuint *coords );
void (GLAPIENTRYP MultiTexCoordP4ui)( GLenum texture, GLenum type, GLuint coords );
void (GLAPIENTRYP MultiTexCoordP4uiv)( GLenum texture, GLenum type, const GLuint *coords );
void (GLAPIENTRYP NormalP3ui)( GLenum type, GLuint coords );
void (GLAPIENTRYP NormalP3uiv)( GLenum type, const GLuint *coords );
void (GLAPIENTRYP ColorP3ui)( GLenum type, GLuint color );
void (GLAPIENTRYP ColorP3uiv)( GLenum type, const GLuint *color );
void (GLAPIENTRYP ColorP4ui)( GLenum type, GLuint color );
void (GLAPIENTRYP ColorP4uiv)( GLenum type, const GLuint *color );
void (GLAPIENTRYP SecondaryColorP3ui)( GLenum type, GLuint color );
void (GLAPIENTRYP SecondaryColorP3uiv)( GLenum type, const GLuint *color );
void (GLAPIENTRYP VertexAttribP1ui)( GLuint index, GLenum type,
GLboolean normalized, GLuint value);
void (GLAPIENTRYP VertexAttribP2ui)( GLuint index, GLenum type,
GLboolean normalized, GLuint value);
void (GLAPIENTRYP VertexAttribP3ui)( GLuint index, GLenum type,
GLboolean normalized, GLuint value);
void (GLAPIENTRYP VertexAttribP4ui)( GLuint index, GLenum type,
GLboolean normalized, GLuint value);
void (GLAPIENTRYP VertexAttribP1uiv)( GLuint index, GLenum type,
GLboolean normalized,
const GLuint *value);
void (GLAPIENTRYP VertexAttribP2uiv)( GLuint index, GLenum type,
GLboolean normalized,
const GLuint *value);
void (GLAPIENTRYP VertexAttribP3uiv)( GLuint index, GLenum type,
GLboolean normalized,
const GLuint *value);
void (GLAPIENTRYP VertexAttribP4uiv)( GLuint index, GLenum type,
GLboolean normalized,
const GLuint *value);
/*@}*/
void (GLAPIENTRYP Rectf)( GLfloat, GLfloat, GLfloat, GLfloat );
reactos/dll/opengl/mesa/src/mesa/main/dispatch.h
-532
View File
@@ -683,44 +683,6 @@
#define _gloffset_SamplerParameterfv 612
#define _gloffset_SamplerParameteri 613
#define _gloffset_SamplerParameteriv 614
#define _gloffset_ColorP3ui 615
#define _gloffset_ColorP3uiv 616
#define _gloffset_ColorP4ui 617
#define _gloffset_ColorP4uiv 618
#define _gloffset_MultiTexCoordP1ui 619
#define _gloffset_MultiTexCoordP1uiv 620
#define _gloffset_MultiTexCoordP2ui 621
#define _gloffset_MultiTexCoordP2uiv 622
#define _gloffset_MultiTexCoordP3ui 623
#define _gloffset_MultiTexCoordP3uiv 624
#define _gloffset_MultiTexCoordP4ui 625
#define _gloffset_MultiTexCoordP4uiv 626
#define _gloffset_NormalP3ui 627
#define _gloffset_NormalP3uiv 628
#define _gloffset_SecondaryColorP3ui 629
#define _gloffset_SecondaryColorP3uiv 630
#define _gloffset_TexCoordP1ui 631
#define _gloffset_TexCoordP1uiv 632
#define _gloffset_TexCoordP2ui 633
#define _gloffset_TexCoordP2uiv 634
#define _gloffset_TexCoordP3ui 635
#define _gloffset_TexCoordP3uiv 636
#define _gloffset_TexCoordP4ui 637
#define _gloffset_TexCoordP4uiv 638
#define _gloffset_VertexAttribP1ui 639
#define _gloffset_VertexAttribP1uiv 640
#define _gloffset_VertexAttribP2ui 641
#define _gloffset_VertexAttribP2uiv 642
#define _gloffset_VertexAttribP3ui 643
#define _gloffset_VertexAttribP3uiv 644
#define _gloffset_VertexAttribP4ui 645
#define _gloffset_VertexAttribP4uiv 646
#define _gloffset_VertexP2ui 647
#define _gloffset_VertexP2uiv 648
#define _gloffset_VertexP3ui 649
#define _gloffset_VertexP3uiv 650
#define _gloffset_VertexP4ui 651
#define _gloffset_VertexP4uiv 652
#define _gloffset_BindTransformFeedback 653
#define _gloffset_DeleteTransformFeedbacks 654
#define _gloffset_DrawTransformFeedback 655
@@ -1254,44 +1216,6 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define SamplerParameterfv_remap_index 204
#define SamplerParameteri_remap_index 205
#define SamplerParameteriv_remap_index 206
#define ColorP3ui_remap_index 207
#define ColorP3uiv_remap_index 208
#define ColorP4ui_remap_index 209
#define ColorP4uiv_remap_index 210
#define MultiTexCoordP1ui_remap_index 211
#define MultiTexCoordP1uiv_remap_index 212
#define MultiTexCoordP2ui_remap_index 213
#define MultiTexCoordP2uiv_remap_index 214
#define MultiTexCoordP3ui_remap_index 215
#define MultiTexCoordP3uiv_remap_index 216
#define MultiTexCoordP4ui_remap_index 217
#define MultiTexCoordP4uiv_remap_index 218
#define NormalP3ui_remap_index 219
#define NormalP3uiv_remap_index 220
#define SecondaryColorP3ui_remap_index 221
#define SecondaryColorP3uiv_remap_index 222
#define TexCoordP1ui_remap_index 223
#define TexCoordP1uiv_remap_index 224
#define TexCoordP2ui_remap_index 225
#define TexCoordP2uiv_remap_index 226
#define TexCoordP3ui_remap_index 227
#define TexCoordP3uiv_remap_index 228
#define TexCoordP4ui_remap_index 229
#define TexCoordP4uiv_remap_index 230
#define VertexAttribP1ui_remap_index 231
#define VertexAttribP1uiv_remap_index 232
#define VertexAttribP2ui_remap_index 233
#define VertexAttribP2uiv_remap_index 234
#define VertexAttribP3ui_remap_index 235
#define VertexAttribP3uiv_remap_index 236
#define VertexAttribP4ui_remap_index 237
#define VertexAttribP4uiv_remap_index 238
#define VertexP2ui_remap_index 239
#define VertexP2uiv_remap_index 240
#define VertexP3ui_remap_index 241
#define VertexP3uiv_remap_index 242
#define VertexP4ui_remap_index 243
#define VertexP4uiv_remap_index 244
#define BindTransformFeedback_remap_index 245
#define DeleteTransformFeedbacks_remap_index 246
#define DrawTransformFeedback_remap_index 247
@@ -1820,44 +1744,6 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define _gloffset_SamplerParameterfv driDispatchRemapTable[SamplerParameterfv_remap_index]
#define _gloffset_SamplerParameteri driDispatchRemapTable[SamplerParameteri_remap_index]
#define _gloffset_SamplerParameteriv driDispatchRemapTable[SamplerParameteriv_remap_index]
#define _gloffset_ColorP3ui driDispatchRemapTable[ColorP3ui_remap_index]
#define _gloffset_ColorP3uiv driDispatchRemapTable[ColorP3uiv_remap_index]
#define _gloffset_ColorP4ui driDispatchRemapTable[ColorP4ui_remap_index]
#define _gloffset_ColorP4uiv driDispatchRemapTable[ColorP4uiv_remap_index]
#define _gloffset_MultiTexCoordP1ui driDispatchRemapTable[MultiTexCoordP1ui_remap_index]
#define _gloffset_MultiTexCoordP1uiv driDispatchRemapTable[MultiTexCoordP1uiv_remap_index]
#define _gloffset_MultiTexCoordP2ui driDispatchRemapTable[MultiTexCoordP2ui_remap_index]
#define _gloffset_MultiTexCoordP2uiv driDispatchRemapTable[MultiTexCoordP2uiv_remap_index]
#define _gloffset_MultiTexCoordP3ui driDispatchRemapTable[MultiTexCoordP3ui_remap_index]
#define _gloffset_MultiTexCoordP3uiv driDispatchRemapTable[MultiTexCoordP3uiv_remap_index]
#define _gloffset_MultiTexCoordP4ui driDispatchRemapTable[MultiTexCoordP4ui_remap_index]
#define _gloffset_MultiTexCoordP4uiv driDispatchRemapTable[MultiTexCoordP4uiv_remap_index]
#define _gloffset_NormalP3ui driDispatchRemapTable[NormalP3ui_remap_index]
#define _gloffset_NormalP3uiv driDispatchRemapTable[NormalP3uiv_remap_index]
#define _gloffset_SecondaryColorP3ui driDispatchRemapTable[SecondaryColorP3ui_remap_index]
#define _gloffset_SecondaryColorP3uiv driDispatchRemapTable[SecondaryColorP3uiv_remap_index]
#define _gloffset_TexCoordP1ui driDispatchRemapTable[TexCoordP1ui_remap_index]
#define _gloffset_TexCoordP1uiv driDispatchRemapTable[TexCoordP1uiv_remap_index]
#define _gloffset_TexCoordP2ui driDispatchRemapTable[TexCoordP2ui_remap_index]
#define _gloffset_TexCoordP2uiv driDispatchRemapTable[TexCoordP2uiv_remap_index]
#define _gloffset_TexCoordP3ui driDispatchRemapTable[TexCoordP3ui_remap_index]
#define _gloffset_TexCoordP3uiv driDispatchRemapTable[TexCoordP3uiv_remap_index]
#define _gloffset_TexCoordP4ui driDispatchRemapTable[TexCoordP4ui_remap_index]
#define _gloffset_TexCoordP4uiv driDispatchRemapTable[TexCoordP4uiv_remap_index]
#define _gloffset_VertexAttribP1ui driDispatchRemapTable[VertexAttribP1ui_remap_index]
#define _gloffset_VertexAttribP1uiv driDispatchRemapTable[VertexAttribP1uiv_remap_index]
#define _gloffset_VertexAttribP2ui driDispatchRemapTable[VertexAttribP2ui_remap_index]
#define _gloffset_VertexAttribP2uiv driDispatchRemapTable[VertexAttribP2uiv_remap_index]
#define _gloffset_VertexAttribP3ui driDispatchRemapTable[VertexAttribP3ui_remap_index]
#define _gloffset_VertexAttribP3uiv driDispatchRemapTable[VertexAttribP3uiv_remap_index]
#define _gloffset_VertexAttribP4ui driDispatchRemapTable[VertexAttribP4ui_remap_index]
#define _gloffset_VertexAttribP4uiv driDispatchRemapTable[VertexAttribP4uiv_remap_index]
#define _gloffset_VertexP2ui driDispatchRemapTable[VertexP2ui_remap_index]
#define _gloffset_VertexP2uiv driDispatchRemapTable[VertexP2uiv_remap_index]
#define _gloffset_VertexP3ui driDispatchRemapTable[VertexP3ui_remap_index]
#define _gloffset_VertexP3uiv driDispatchRemapTable[VertexP3uiv_remap_index]
#define _gloffset_VertexP4ui driDispatchRemapTable[VertexP4ui_remap_index]
#define _gloffset_VertexP4uiv driDispatchRemapTable[VertexP4uiv_remap_index]
#define _gloffset_BindTransformFeedback driDispatchRemapTable[BindTransformFeedback_remap_index]
#define _gloffset_DeleteTransformFeedbacks driDispatchRemapTable[DeleteTransformFeedbacks_remap_index]
#define _gloffset_DrawTransformFeedback driDispatchRemapTable[DrawTransformFeedback_remap_index]
@@ -8946,424 +8832,6 @@ static inline void SET_SamplerParameteriv(struct _glapi_table *disp, void (GLAPI
SET_by_offset(disp, _gloffset_SamplerParameteriv, fn);
}
typedef void (GLAPIENTRYP _glptr_ColorP3ui)(GLenum, GLuint);
#define CALL_ColorP3ui(disp, parameters) \
(* GET_ColorP3ui(disp)) parameters
static inline _glptr_ColorP3ui GET_ColorP3ui(struct _glapi_table *disp) {
return (_glptr_ColorP3ui) (GET_by_offset(disp, _gloffset_ColorP3ui));
}
static inline void SET_ColorP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_ColorP3ui, fn);
}
typedef void (GLAPIENTRYP _glptr_ColorP3uiv)(GLenum, const GLuint *);
#define CALL_ColorP3uiv(disp, parameters) \
(* GET_ColorP3uiv(disp)) parameters
static inline _glptr_ColorP3uiv GET_ColorP3uiv(struct _glapi_table *disp) {
return (_glptr_ColorP3uiv) (GET_by_offset(disp, _gloffset_ColorP3uiv));
}
static inline void SET_ColorP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_ColorP3uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_ColorP4ui)(GLenum, GLuint);
#define CALL_ColorP4ui(disp, parameters) \
(* GET_ColorP4ui(disp)) parameters
static inline _glptr_ColorP4ui GET_ColorP4ui(struct _glapi_table *disp) {
return (_glptr_ColorP4ui) (GET_by_offset(disp, _gloffset_ColorP4ui));
}
static inline void SET_ColorP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_ColorP4ui, fn);
}
typedef void (GLAPIENTRYP _glptr_ColorP4uiv)(GLenum, const GLuint *);
#define CALL_ColorP4uiv(disp, parameters) \
(* GET_ColorP4uiv(disp)) parameters
static inline _glptr_ColorP4uiv GET_ColorP4uiv(struct _glapi_table *disp) {
return (_glptr_ColorP4uiv) (GET_by_offset(disp, _gloffset_ColorP4uiv));
}
static inline void SET_ColorP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_ColorP4uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_MultiTexCoordP1ui)(GLenum, GLenum, GLuint);
#define CALL_MultiTexCoordP1ui(disp, parameters) \
(* GET_MultiTexCoordP1ui(disp)) parameters
static inline _glptr_MultiTexCoordP1ui GET_MultiTexCoordP1ui(struct _glapi_table *disp) {
return (_glptr_MultiTexCoordP1ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP1ui));
}
static inline void SET_MultiTexCoordP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_MultiTexCoordP1ui, fn);
}
typedef void (GLAPIENTRYP _glptr_MultiTexCoordP1uiv)(GLenum, GLenum, const GLuint *);
#define CALL_MultiTexCoordP1uiv(disp, parameters) \
(* GET_MultiTexCoordP1uiv(disp)) parameters
static inline _glptr_MultiTexCoordP1uiv GET_MultiTexCoordP1uiv(struct _glapi_table *disp) {
return (_glptr_MultiTexCoordP1uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP1uiv));
}
static inline void SET_MultiTexCoordP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_MultiTexCoordP1uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_MultiTexCoordP2ui)(GLenum, GLenum, GLuint);
#define CALL_MultiTexCoordP2ui(disp, parameters) \
(* GET_MultiTexCoordP2ui(disp)) parameters
static inline _glptr_MultiTexCoordP2ui GET_MultiTexCoordP2ui(struct _glapi_table *disp) {
return (_glptr_MultiTexCoordP2ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP2ui));
}
static inline void SET_MultiTexCoordP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_MultiTexCoordP2ui, fn);
}
typedef void (GLAPIENTRYP _glptr_MultiTexCoordP2uiv)(GLenum, GLenum, const GLuint *);
#define CALL_MultiTexCoordP2uiv(disp, parameters) \
(* GET_MultiTexCoordP2uiv(disp)) parameters
static inline _glptr_MultiTexCoordP2uiv GET_MultiTexCoordP2uiv(struct _glapi_table *disp) {
return (_glptr_MultiTexCoordP2uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP2uiv));
}
static inline void SET_MultiTexCoordP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_MultiTexCoordP2uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_MultiTexCoordP3ui)(GLenum, GLenum, GLuint);
#define CALL_MultiTexCoordP3ui(disp, parameters) \
(* GET_MultiTexCoordP3ui(disp)) parameters
static inline _glptr_MultiTexCoordP3ui GET_MultiTexCoordP3ui(struct _glapi_table *disp) {
return (_glptr_MultiTexCoordP3ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP3ui));
}
static inline void SET_MultiTexCoordP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_MultiTexCoordP3ui, fn);
}
typedef void (GLAPIENTRYP _glptr_MultiTexCoordP3uiv)(GLenum, GLenum, const GLuint *);
#define CALL_MultiTexCoordP3uiv(disp, parameters) \
(* GET_MultiTexCoordP3uiv(disp)) parameters
static inline _glptr_MultiTexCoordP3uiv GET_MultiTexCoordP3uiv(struct _glapi_table *disp) {
return (_glptr_MultiTexCoordP3uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP3uiv));
}
static inline void SET_MultiTexCoordP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_MultiTexCoordP3uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_MultiTexCoordP4ui)(GLenum, GLenum, GLuint);
#define CALL_MultiTexCoordP4ui(disp, parameters) \
(* GET_MultiTexCoordP4ui(disp)) parameters
static inline _glptr_MultiTexCoordP4ui GET_MultiTexCoordP4ui(struct _glapi_table *disp) {
return (_glptr_MultiTexCoordP4ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP4ui));
}
static inline void SET_MultiTexCoordP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_MultiTexCoordP4ui, fn);
}
typedef void (GLAPIENTRYP _glptr_MultiTexCoordP4uiv)(GLenum, GLenum, const GLuint *);
#define CALL_MultiTexCoordP4uiv(disp, parameters) \
(* GET_MultiTexCoordP4uiv(disp)) parameters
static inline _glptr_MultiTexCoordP4uiv GET_MultiTexCoordP4uiv(struct _glapi_table *disp) {
return (_glptr_MultiTexCoordP4uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP4uiv));
}
static inline void SET_MultiTexCoordP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_MultiTexCoordP4uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_NormalP3ui)(GLenum, GLuint);
#define CALL_NormalP3ui(disp, parameters) \
(* GET_NormalP3ui(disp)) parameters
static inline _glptr_NormalP3ui GET_NormalP3ui(struct _glapi_table *disp) {
return (_glptr_NormalP3ui) (GET_by_offset(disp, _gloffset_NormalP3ui));
}
static inline void SET_NormalP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_NormalP3ui, fn);
}
typedef void (GLAPIENTRYP _glptr_NormalP3uiv)(GLenum, const GLuint *);
#define CALL_NormalP3uiv(disp, parameters) \
(* GET_NormalP3uiv(disp)) parameters
static inline _glptr_NormalP3uiv GET_NormalP3uiv(struct _glapi_table *disp) {
return (_glptr_NormalP3uiv) (GET_by_offset(disp, _gloffset_NormalP3uiv));
}
static inline void SET_NormalP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_NormalP3uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_SecondaryColorP3ui)(GLenum, GLuint);
#define CALL_SecondaryColorP3ui(disp, parameters) \
(* GET_SecondaryColorP3ui(disp)) parameters
static inline _glptr_SecondaryColorP3ui GET_SecondaryColorP3ui(struct _glapi_table *disp) {
return (_glptr_SecondaryColorP3ui) (GET_by_offset(disp, _gloffset_SecondaryColorP3ui));
}
static inline void SET_SecondaryColorP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_SecondaryColorP3ui, fn);
}
typedef void (GLAPIENTRYP _glptr_SecondaryColorP3uiv)(GLenum, const GLuint *);
#define CALL_SecondaryColorP3uiv(disp, parameters) \
(* GET_SecondaryColorP3uiv(disp)) parameters
static inline _glptr_SecondaryColorP3uiv GET_SecondaryColorP3uiv(struct _glapi_table *disp) {
return (_glptr_SecondaryColorP3uiv) (GET_by_offset(disp, _gloffset_SecondaryColorP3uiv));
}
static inline void SET_SecondaryColorP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_SecondaryColorP3uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_TexCoordP1ui)(GLenum, GLuint);
#define CALL_TexCoordP1ui(disp, parameters) \
(* GET_TexCoordP1ui(disp)) parameters
static inline _glptr_TexCoordP1ui GET_TexCoordP1ui(struct _glapi_table *disp) {
return (_glptr_TexCoordP1ui) (GET_by_offset(disp, _gloffset_TexCoordP1ui));
}
static inline void SET_TexCoordP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_TexCoordP1ui, fn);
}
typedef void (GLAPIENTRYP _glptr_TexCoordP1uiv)(GLenum, const GLuint *);
#define CALL_TexCoordP1uiv(disp, parameters) \
(* GET_TexCoordP1uiv(disp)) parameters
static inline _glptr_TexCoordP1uiv GET_TexCoordP1uiv(struct _glapi_table *disp) {
return (_glptr_TexCoordP1uiv) (GET_by_offset(disp, _gloffset_TexCoordP1uiv));
}
static inline void SET_TexCoordP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_TexCoordP1uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_TexCoordP2ui)(GLenum, GLuint);
#define CALL_TexCoordP2ui(disp, parameters) \
(* GET_TexCoordP2ui(disp)) parameters
static inline _glptr_TexCoordP2ui GET_TexCoordP2ui(struct _glapi_table *disp) {
return (_glptr_TexCoordP2ui) (GET_by_offset(disp, _gloffset_TexCoordP2ui));
}
static inline void SET_TexCoordP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_TexCoordP2ui, fn);
}
typedef void (GLAPIENTRYP _glptr_TexCoordP2uiv)(GLenum, const GLuint *);
#define CALL_TexCoordP2uiv(disp, parameters) \
(* GET_TexCoordP2uiv(disp)) parameters
static inline _glptr_TexCoordP2uiv GET_TexCoordP2uiv(struct _glapi_table *disp) {
return (_glptr_TexCoordP2uiv) (GET_by_offset(disp, _gloffset_TexCoordP2uiv));
}
static inline void SET_TexCoordP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_TexCoordP2uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_TexCoordP3ui)(GLenum, GLuint);
#define CALL_TexCoordP3ui(disp, parameters) \
(* GET_TexCoordP3ui(disp)) parameters
static inline _glptr_TexCoordP3ui GET_TexCoordP3ui(struct _glapi_table *disp) {
return (_glptr_TexCoordP3ui) (GET_by_offset(disp, _gloffset_TexCoordP3ui));
}
static inline void SET_TexCoordP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_TexCoordP3ui, fn);
}
typedef void (GLAPIENTRYP _glptr_TexCoordP3uiv)(GLenum, const GLuint *);
#define CALL_TexCoordP3uiv(disp, parameters) \
(* GET_TexCoordP3uiv(disp)) parameters
static inline _glptr_TexCoordP3uiv GET_TexCoordP3uiv(struct _glapi_table *disp) {
return (_glptr_TexCoordP3uiv) (GET_by_offset(disp, _gloffset_TexCoordP3uiv));
}
static inline void SET_TexCoordP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_TexCoordP3uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_TexCoordP4ui)(GLenum, GLuint);
#define CALL_TexCoordP4ui(disp, parameters) \
(* GET_TexCoordP4ui(disp)) parameters
static inline _glptr_TexCoordP4ui GET_TexCoordP4ui(struct _glapi_table *disp) {
return (_glptr_TexCoordP4ui) (GET_by_offset(disp, _gloffset_TexCoordP4ui));
}
static inline void SET_TexCoordP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_TexCoordP4ui, fn);
}
typedef void (GLAPIENTRYP _glptr_TexCoordP4uiv)(GLenum, const GLuint *);
#define CALL_TexCoordP4uiv(disp, parameters) \
(* GET_TexCoordP4uiv(disp)) parameters
static inline _glptr_TexCoordP4uiv GET_TexCoordP4uiv(struct _glapi_table *disp) {
return (_glptr_TexCoordP4uiv) (GET_by_offset(disp, _gloffset_TexCoordP4uiv));
}
static inline void SET_TexCoordP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_TexCoordP4uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexAttribP1ui)(GLuint, GLenum, GLboolean, GLuint);
#define CALL_VertexAttribP1ui(disp, parameters) \
(* GET_VertexAttribP1ui(disp)) parameters
static inline _glptr_VertexAttribP1ui GET_VertexAttribP1ui(struct _glapi_table *disp) {
return (_glptr_VertexAttribP1ui) (GET_by_offset(disp, _gloffset_VertexAttribP1ui));
}
static inline void SET_VertexAttribP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
SET_by_offset(disp, _gloffset_VertexAttribP1ui, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexAttribP1uiv)(GLuint, GLenum, GLboolean, const GLuint *);
#define CALL_VertexAttribP1uiv(disp, parameters) \
(* GET_VertexAttribP1uiv(disp)) parameters
static inline _glptr_VertexAttribP1uiv GET_VertexAttribP1uiv(struct _glapi_table *disp) {
return (_glptr_VertexAttribP1uiv) (GET_by_offset(disp, _gloffset_VertexAttribP1uiv));
}
static inline void SET_VertexAttribP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
SET_by_offset(disp, _gloffset_VertexAttribP1uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexAttribP2ui)(GLuint, GLenum, GLboolean, GLuint);
#define CALL_VertexAttribP2ui(disp, parameters) \
(* GET_VertexAttribP2ui(disp)) parameters
static inline _glptr_VertexAttribP2ui GET_VertexAttribP2ui(struct _glapi_table *disp) {
return (_glptr_VertexAttribP2ui) (GET_by_offset(disp, _gloffset_VertexAttribP2ui));
}
static inline void SET_VertexAttribP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
SET_by_offset(disp, _gloffset_VertexAttribP2ui, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexAttribP2uiv)(GLuint, GLenum, GLboolean, const GLuint *);
#define CALL_VertexAttribP2uiv(disp, parameters) \
(* GET_VertexAttribP2uiv(disp)) parameters
static inline _glptr_VertexAttribP2uiv GET_VertexAttribP2uiv(struct _glapi_table *disp) {
return (_glptr_VertexAttribP2uiv) (GET_by_offset(disp, _gloffset_VertexAttribP2uiv));
}
static inline void SET_VertexAttribP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
SET_by_offset(disp, _gloffset_VertexAttribP2uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexAttribP3ui)(GLuint, GLenum, GLboolean, GLuint);
#define CALL_VertexAttribP3ui(disp, parameters) \
(* GET_VertexAttribP3ui(disp)) parameters
static inline _glptr_VertexAttribP3ui GET_VertexAttribP3ui(struct _glapi_table *disp) {
return (_glptr_VertexAttribP3ui) (GET_by_offset(disp, _gloffset_VertexAttribP3ui));
}
static inline void SET_VertexAttribP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
SET_by_offset(disp, _gloffset_VertexAttribP3ui, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexAttribP3uiv)(GLuint, GLenum, GLboolean, const GLuint *);
#define CALL_VertexAttribP3uiv(disp, parameters) \
(* GET_VertexAttribP3uiv(disp)) parameters
static inline _glptr_VertexAttribP3uiv GET_VertexAttribP3uiv(struct _glapi_table *disp) {
return (_glptr_VertexAttribP3uiv) (GET_by_offset(disp, _gloffset_VertexAttribP3uiv));
}
static inline void SET_VertexAttribP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
SET_by_offset(disp, _gloffset_VertexAttribP3uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexAttribP4ui)(GLuint, GLenum, GLboolean, GLuint);
#define CALL_VertexAttribP4ui(disp, parameters) \
(* GET_VertexAttribP4ui(disp)) parameters
static inline _glptr_VertexAttribP4ui GET_VertexAttribP4ui(struct _glapi_table *disp) {
return (_glptr_VertexAttribP4ui) (GET_by_offset(disp, _gloffset_VertexAttribP4ui));
}
static inline void SET_VertexAttribP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) {
SET_by_offset(disp, _gloffset_VertexAttribP4ui, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexAttribP4uiv)(GLuint, GLenum, GLboolean, const GLuint *);
#define CALL_VertexAttribP4uiv(disp, parameters) \
(* GET_VertexAttribP4uiv(disp)) parameters
static inline _glptr_VertexAttribP4uiv GET_VertexAttribP4uiv(struct _glapi_table *disp) {
return (_glptr_VertexAttribP4uiv) (GET_by_offset(disp, _gloffset_VertexAttribP4uiv));
}
static inline void SET_VertexAttribP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) {
SET_by_offset(disp, _gloffset_VertexAttribP4uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexP2ui)(GLenum, GLuint);
#define CALL_VertexP2ui(disp, parameters) \
(* GET_VertexP2ui(disp)) parameters
static inline _glptr_VertexP2ui GET_VertexP2ui(struct _glapi_table *disp) {
return (_glptr_VertexP2ui) (GET_by_offset(disp, _gloffset_VertexP2ui));
}
static inline void SET_VertexP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_VertexP2ui, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexP2uiv)(GLenum, const GLuint *);
#define CALL_VertexP2uiv(disp, parameters) \
(* GET_VertexP2uiv(disp)) parameters
static inline _glptr_VertexP2uiv GET_VertexP2uiv(struct _glapi_table *disp) {
return (_glptr_VertexP2uiv) (GET_by_offset(disp, _gloffset_VertexP2uiv));
}
static inline void SET_VertexP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_VertexP2uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexP3ui)(GLenum, GLuint);
#define CALL_VertexP3ui(disp, parameters) \
(* GET_VertexP3ui(disp)) parameters
static inline _glptr_VertexP3ui GET_VertexP3ui(struct _glapi_table *disp) {
return (_glptr_VertexP3ui) (GET_by_offset(disp, _gloffset_VertexP3ui));
}
static inline void SET_VertexP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_VertexP3ui, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexP3uiv)(GLenum, const GLuint *);
#define CALL_VertexP3uiv(disp, parameters) \
(* GET_VertexP3uiv(disp)) parameters
static inline _glptr_VertexP3uiv GET_VertexP3uiv(struct _glapi_table *disp) {
return (_glptr_VertexP3uiv) (GET_by_offset(disp, _gloffset_VertexP3uiv));
}
static inline void SET_VertexP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_VertexP3uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexP4ui)(GLenum, GLuint);
#define CALL_VertexP4ui(disp, parameters) \
(* GET_VertexP4ui(disp)) parameters
static inline _glptr_VertexP4ui GET_VertexP4ui(struct _glapi_table *disp) {
return (_glptr_VertexP4ui) (GET_by_offset(disp, _gloffset_VertexP4ui));
}
static inline void SET_VertexP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
SET_by_offset(disp, _gloffset_VertexP4ui, fn);
}
typedef void (GLAPIENTRYP _glptr_VertexP4uiv)(GLenum, const GLuint *);
#define CALL_VertexP4uiv(disp, parameters) \
(* GET_VertexP4uiv(disp)) parameters
static inline _glptr_VertexP4uiv GET_VertexP4uiv(struct _glapi_table *disp) {
return (_glptr_VertexP4uiv) (GET_by_offset(disp, _gloffset_VertexP4uiv));
}
static inline void SET_VertexP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) {
SET_by_offset(disp, _gloffset_VertexP4uiv, fn);
}
typedef void (GLAPIENTRYP _glptr_BindTransformFeedback)(GLenum, GLuint);
#define CALL_BindTransformFeedback(disp, parameters) \
(* GET_BindTransformFeedback(disp)) parameters
reactos/dll/opengl/mesa/src/mesa/main/extensions.c
-4
View File
@@ -135,7 +135,6 @@ static const struct extension extension_table[] = {
{ "GL_ARB_texture_rgb10_a2ui", o(ARB_texture_rgb10_a2ui), GL, 2009 },
{ "GL_ARB_texture_rg", o(ARB_texture_rg), GL, 2008 },
{ "GL_ARB_texture_storage", o(ARB_texture_storage), GL, 2011 },
{ "GL_ARB_texture_swizzle", o(EXT_texture_swizzle), GL, 2008 },
{ "GL_ARB_transform_feedback2", o(ARB_transform_feedback2), GL, 2010 },
{ "GL_ARB_transpose_matrix", o(ARB_transpose_matrix), GL, 1999 },
{ "GL_ARB_uniform_buffer_object", o(ARB_uniform_buffer_object), GL, 2002 },
@@ -144,7 +143,6 @@ static const struct extension extension_table[] = {
{ "GL_ARB_vertex_buffer_object", o(dummy_true), GL, 2003 },
{ "GL_ARB_vertex_program", o(ARB_vertex_program), GL, 2002 },
{ "GL_ARB_vertex_shader", o(ARB_vertex_shader), GL, 2002 },
{ "GL_ARB_vertex_type_2_10_10_10_rev", o(ARB_vertex_type_2_10_10_10_rev), GL, 2009 },
{ "GL_ARB_window_pos", o(ARB_window_pos), GL, 2001 },
/* EXT extensions */
{ "GL_EXT_abgr", o(dummy_true), GL, 1995 },
@@ -205,7 +203,6 @@ static const struct extension extension_table[] = {
{ "GL_EXT_texture_snorm", o(EXT_texture_snorm), GL, 2009 },
{ "GL_EXT_texture_sRGB", o(EXT_texture_sRGB), GL, 2004 },
{ "GL_EXT_texture_sRGB_decode", o(EXT_texture_sRGB_decode), GL, 2006 },
{ "GL_EXT_texture_swizzle", o(EXT_texture_swizzle), GL, 2008 },
{ "GL_EXT_texture_type_2_10_10_10_REV", o(dummy_true), ES2, 2008 },
{ "GL_EXT_timer_query", o(EXT_timer_query), GL, 2006 },
{ "GL_EXT_transform_feedback", o(EXT_transform_feedback), GL, 2011 },
@@ -479,7 +476,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE;
#endif
ctx->Extensions.EXT_texture_swizzle = GL_TRUE;
#if FEATURE_EXT_transform_feedback
/*ctx->Extensions.EXT_transform_feedback = GL_TRUE;*/
#endif
reactos/dll/opengl/mesa/src/mesa/main/mtypes.h
-4
View File
@@ -1356,8 +1356,6 @@ struct gl_texture_object
GLint _MaxLevel; /**< actual max mipmap level (q in the spec) */
GLfloat _MaxLambda; /**< = _MaxLevel - BaseLevel (q - b in spec) */
GLint CropRect[4]; /**< GL_OES_draw_texture */
GLenum Swizzle[4]; /**< GL_EXT_texture_swizzle */
GLuint _Swizzle; /**< same as Swizzle, but SWIZZLE_* format */
GLboolean GenerateMipmap; /**< GL_SGIS_generate_mipmap */
GLboolean _Complete; /**< Is texture object complete? */
GLboolean _RenderToTexture; /**< Any rendering to this texture? */
@@ -2909,7 +2907,6 @@ struct gl_extensions
GLboolean ARB_vertex_array_object;
GLboolean ARB_vertex_program;
GLboolean ARB_vertex_shader;
GLboolean ARB_vertex_type_2_10_10_10_rev;
GLboolean ARB_window_pos;
GLboolean EXT_blend_color;
GLboolean EXT_blend_equation_separate;
@@ -2949,7 +2946,6 @@ struct gl_extensions
GLboolean EXT_texture_snorm;
GLboolean EXT_texture_sRGB;
GLboolean EXT_texture_sRGB_decode;
GLboolean EXT_texture_swizzle;
GLboolean EXT_transform_feedback;
GLboolean EXT_timer_query;
GLboolean EXT_vertex_array_bgra;
reactos/dll/opengl/mesa/src/mesa/main/texobj.c
-7
View File
@@ -147,11 +147,6 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
obj->Sampler.CompareFailValue = 0.0F; /* ARB_shadow_ambient */
obj->Sampler.DepthMode = GL_LUMINANCE; /* ARB_depth_texture */
obj->Sampler.CubeMapSeamless = GL_FALSE;
obj->Swizzle[0] = GL_RED;
obj->Swizzle[1] = GL_GREEN;
obj->Swizzle[2] = GL_BLUE;
obj->Swizzle[3] = GL_ALPHA;
obj->_Swizzle = SWIZZLE_NOOP;
obj->Sampler.sRGBDecode = GL_DECODE_EXT;
}
@@ -263,8 +258,6 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
dest->_MaxLambda = src->_MaxLambda;
dest->GenerateMipmap = src->GenerateMipmap;
dest->_Complete = src->_Complete;
COPY_4V(dest->Swizzle, src->Swizzle);
dest->_Swizzle = src->_Swizzle;
dest->RequiredTextureImageUnits = src->RequiredTextureImageUnits;
}
reactos/dll/opengl/mesa/src/mesa/main/texparam.c
-115
View File
@@ -159,45 +159,6 @@ get_texobj(struct gl_context *ctx, GLenum target, GLboolean get)
}
/**
* Convert GL_RED/GREEN/BLUE/ALPHA/ZERO/ONE to SWIZZLE_X/Y/Z/W/ZERO/ONE.
* \return -1 if error.
*/
static GLint
comp_to_swizzle(GLenum comp)
{
switch (comp) {
case GL_RED:
return SWIZZLE_X;
case GL_GREEN:
return SWIZZLE_Y;
case GL_BLUE:
return SWIZZLE_Z;
case GL_ALPHA:
return SWIZZLE_W;
case GL_ZERO:
return SWIZZLE_ZERO;
case GL_ONE:
return SWIZZLE_ONE;
default:
return -1;
}
}
static void
set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)
{
ASSERT(comp < 4);
ASSERT(swz <= SWIZZLE_NIL);
{
GLuint mask = 0x7 << (3 * comp);
GLuint s = (*swizzle & ~mask) | (swz << (3 * comp));
*swizzle = s;
}
}
/**
* This is called just prior to changing any texture object state which
* will not effect texture completeness.
@@ -406,47 +367,6 @@ set_tex_parameteri(struct gl_context *ctx,
return GL_TRUE;
#endif
case GL_TEXTURE_SWIZZLE_R_EXT:
case GL_TEXTURE_SWIZZLE_G_EXT:
case GL_TEXTURE_SWIZZLE_B_EXT:
case GL_TEXTURE_SWIZZLE_A_EXT:
if (ctx->Extensions.EXT_texture_swizzle) {
const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
const GLint swz = comp_to_swizzle(params[0]);
if (swz < 0) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glTexParameter(swizzle 0x%x)", params[0]);
return GL_FALSE;
}
ASSERT(comp < 4);
flush(ctx);
texObj->Swizzle[comp] = params[0];
set_swizzle_component(&texObj->_Swizzle, comp, swz);
return GL_TRUE;
}
goto invalid_pname;
case GL_TEXTURE_SWIZZLE_RGBA_EXT:
if (ctx->Extensions.EXT_texture_swizzle) {
GLuint comp;
flush(ctx);
for (comp = 0; comp < 4; comp++) {
const GLint swz = comp_to_swizzle(params[comp]);
if (swz >= 0) {
texObj->Swizzle[comp] = params[comp];
set_swizzle_component(&texObj->_Swizzle, comp, swz);
}
else {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glTexParameter(swizzle 0x%x)", params[comp]);
return GL_FALSE;
}
}
return GL_TRUE;
}
goto invalid_pname;
case GL_TEXTURE_SRGB_DECODE_EXT:
if (ctx->Extensions.EXT_texture_sRGB_decode) {
GLenum decode = params[0];
@@ -1165,27 +1085,6 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
break;
#endif
case GL_TEXTURE_SWIZZLE_R_EXT:
case GL_TEXTURE_SWIZZLE_G_EXT:
case GL_TEXTURE_SWIZZLE_B_EXT:
case GL_TEXTURE_SWIZZLE_A_EXT:
if (!ctx->Extensions.EXT_texture_swizzle)
goto invalid_pname;
*params = (GLfloat) obj->Swizzle[pname - GL_TEXTURE_SWIZZLE_R_EXT];
break;
case GL_TEXTURE_SWIZZLE_RGBA_EXT:
if (!ctx->Extensions.EXT_texture_swizzle) {
goto invalid_pname;
}
else {
GLuint comp;
for (comp = 0; comp < 4; comp++) {
params[comp] = (GLfloat) obj->Swizzle[comp];
}
}
break;
case GL_TEXTURE_CUBE_MAP_SEAMLESS:
if (!ctx->Extensions.AMD_seamless_cubemap_per_texture)
goto invalid_pname;
@@ -1310,20 +1209,6 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
params[3] = obj->CropRect[3];
break;
#endif
case GL_TEXTURE_SWIZZLE_R_EXT:
case GL_TEXTURE_SWIZZLE_G_EXT:
case GL_TEXTURE_SWIZZLE_B_EXT:
case GL_TEXTURE_SWIZZLE_A_EXT:
if (!ctx->Extensions.EXT_texture_swizzle)
goto invalid_pname;
*params = obj->Swizzle[pname - GL_TEXTURE_SWIZZLE_R_EXT];
break;
case GL_TEXTURE_SWIZZLE_RGBA_EXT:
if (!ctx->Extensions.EXT_texture_swizzle)
goto invalid_pname;
COPY_4V(params, obj->Swizzle);
break;
case GL_TEXTURE_CUBE_MAP_SEAMLESS:
if (!ctx->Extensions.AMD_seamless_cubemap_per_texture)
reactos/dll/opengl/mesa/src/mesa/main/varray.c
+7 -46
View File
@@ -59,8 +59,6 @@
#define DOUBLE_BIT 0x200
#define FIXED_ES_BIT 0x400
#define FIXED_GL_BIT 0x800
#define UNSIGNED_INT_2_10_10_10_REV_BIT 0x1000
#define INT_2_10_10_10_REV_BIT 0x2000
/** Convert GL datatype enum into a <type>_BIT value seen above */
@@ -93,10 +91,6 @@ type_to_bit(const struct gl_context *ctx, GLenum type)
return DOUBLE_BIT;
case GL_FIXED:
return ctx->API == API_OPENGL ? FIXED_GL_BIT : FIXED_ES_BIT;
case GL_UNSIGNED_INT_2_10_10_10_REV:
return UNSIGNED_INT_2_10_10_10_REV_BIT;
case GL_INT_2_10_10_10_REV:
return INT_2_10_10_10_REV_BIT;
default:
return 0;
}
@@ -140,10 +134,6 @@ update_array(struct gl_context *ctx,
if (!ctx->Extensions.ARB_ES2_compatibility) {
legalTypesMask &= ~FIXED_GL_BIT;
}
if (!ctx->Extensions.ARB_vertex_type_2_10_10_10_rev) {
legalTypesMask &= ~(UNSIGNED_INT_2_10_10_10_REV_BIT |
INT_2_10_10_10_REV_BIT);
}
typeBit = type_to_bit(ctx, type);
if (typeBit == 0x0 || (typeBit & legalTypesMask) == 0x0) {
@@ -159,17 +149,7 @@ update_array(struct gl_context *ctx,
if (ctx->Extensions.EXT_vertex_array_bgra &&
sizeMax == BGRA_OR_4 &&
size == GL_BGRA) {
GLboolean bgra_error = GL_FALSE;
if (ctx->Extensions.ARB_vertex_type_2_10_10_10_rev) {
if (type != GL_UNSIGNED_INT_2_10_10_10_REV &&
type != GL_INT_2_10_10_10_REV &&
type != GL_UNSIGNED_BYTE)
bgra_error = GL_TRUE;
} else if (type != GL_UNSIGNED_BYTE)
bgra_error = GL_TRUE;
if (bgra_error) {
if (type != GL_UNSIGNED_BYTE){
_mesa_error(ctx, GL_INVALID_VALUE, "%s(GL_BGRA/GLubyte)", func);
return;
}
@@ -181,13 +161,6 @@ update_array(struct gl_context *ctx,
return;
}
if (ctx->Extensions.ARB_vertex_type_2_10_10_10_rev &&
(type == GL_UNSIGNED_INT_2_10_10_10_REV ||
type == GL_INT_2_10_10_10_REV) && size != 4) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(size=%d)", func, size);
return;
}
ASSERT(size <= 4);
if (stride < 0) {
@@ -229,9 +202,7 @@ void GLAPIENTRY
_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
{
GLbitfield legalTypes = (SHORT_BIT | INT_BIT | FLOAT_BIT |
DOUBLE_BIT | HALF_BIT | FIXED_ES_BIT |
UNSIGNED_INT_2_10_10_10_REV_BIT |
INT_2_10_10_10_REV_BIT);
DOUBLE_BIT | HALF_BIT | FIXED_ES_BIT);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -249,9 +220,7 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
{
const GLbitfield legalTypes = (BYTE_BIT | SHORT_BIT | INT_BIT |
HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
FIXED_ES_BIT |
UNSIGNED_INT_2_10_10_10_REV_BIT |
INT_2_10_10_10_REV_BIT);
FIXED_ES_BIT);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -268,9 +237,7 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
SHORT_BIT | UNSIGNED_SHORT_BIT |
INT_BIT | UNSIGNED_INT_BIT |
HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
FIXED_ES_BIT |
UNSIGNED_INT_2_10_10_10_REV_BIT |
INT_2_10_10_10_REV_BIT);
FIXED_ES_BIT);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -314,9 +281,7 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT |
SHORT_BIT | UNSIGNED_SHORT_BIT |
INT_BIT | UNSIGNED_INT_BIT |
HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
UNSIGNED_INT_2_10_10_10_REV_BIT |
INT_2_10_10_10_REV_BIT);
HALF_BIT | FLOAT_BIT | DOUBLE_BIT);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -332,9 +297,7 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
{
GLbitfield legalTypes = (SHORT_BIT | INT_BIT |
HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
FIXED_ES_BIT |
UNSIGNED_INT_2_10_10_10_REV_BIT |
INT_2_10_10_10_REV_BIT);
FIXED_ES_BIT);
GET_CURRENT_CONTEXT(ctx);
const GLuint unit = ctx->Array.ActiveTexture;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -432,9 +395,7 @@ _mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
SHORT_BIT | UNSIGNED_SHORT_BIT |
INT_BIT | UNSIGNED_INT_BIT |
HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
FIXED_ES_BIT | FIXED_GL_BIT |
UNSIGNED_INT_2_10_10_10_REV_BIT |
INT_2_10_10_10_REV_BIT);
FIXED_ES_BIT | FIXED_GL_BIT);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
reactos/dll/opengl/mesa/src/mesa/main/version.c
+1 -3
View File
@@ -171,9 +171,7 @@ compute_version(struct gl_context *ctx)
ctx->Extensions.ARB_occlusion_query2 &&
ctx->Extensions.ARB_sampler_objects &&
ctx->Extensions.ARB_texture_rgb10_a2ui &&
ctx->Extensions.ARB_timer_query &&
ctx->Extensions.ARB_vertex_type_2_10_10_10_rev &&
ctx->Extensions.EXT_texture_swizzle);
ctx->Extensions.ARB_timer_query);
if (ver_3_3) {
major = 3;
reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c
-47
View File
@@ -145,53 +145,6 @@ install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
SET_VertexAttribI2uivEXT(tab, vfmt->VertexAttribI2uiv);
SET_VertexAttribI3uivEXT(tab, vfmt->VertexAttribI3uiv);
SET_VertexAttribI4uivEXT(tab, vfmt->VertexAttribI4uiv);
/* GL_ARB_vertex_type_10_10_10_2_rev / GL 3.3 */
SET_VertexP2ui(tab, vfmt->VertexP2ui);
SET_VertexP2uiv(tab, vfmt->VertexP2uiv);
SET_VertexP3ui(tab, vfmt->VertexP3ui);
SET_VertexP3uiv(tab, vfmt->VertexP3uiv);
SET_VertexP4ui(tab, vfmt->VertexP4ui);
SET_VertexP4uiv(tab, vfmt->VertexP4uiv);
SET_TexCoordP1ui(tab, vfmt->TexCoordP1ui);
SET_TexCoordP1uiv(tab, vfmt->TexCoordP1uiv);
SET_TexCoordP2ui(tab, vfmt->TexCoordP2ui);
SET_TexCoordP2uiv(tab, vfmt->TexCoordP2uiv);
SET_TexCoordP3ui(tab, vfmt->TexCoordP3ui);
SET_TexCoordP3uiv(tab, vfmt->TexCoordP3uiv);
SET_TexCoordP4ui(tab, vfmt->TexCoordP4ui);
SET_TexCoordP4uiv(tab, vfmt->TexCoordP4uiv);
SET_MultiTexCoordP1ui(tab, vfmt->MultiTexCoordP1ui);
SET_MultiTexCoordP2ui(tab, vfmt->MultiTexCoordP2ui);
SET_MultiTexCoordP3ui(tab, vfmt->MultiTexCoordP3ui);
SET_MultiTexCoordP4ui(tab, vfmt->MultiTexCoordP4ui);
SET_MultiTexCoordP1uiv(tab, vfmt->MultiTexCoordP1uiv);
SET_MultiTexCoordP2uiv(tab, vfmt->MultiTexCoordP2uiv);
SET_MultiTexCoordP3uiv(tab, vfmt->MultiTexCoordP3uiv);
SET_MultiTexCoordP4uiv(tab, vfmt->MultiTexCoordP4uiv);
SET_NormalP3ui(tab, vfmt->NormalP3ui);
SET_NormalP3uiv(tab, vfmt->NormalP3uiv);
SET_ColorP3ui(tab, vfmt->ColorP3ui);
SET_ColorP4ui(tab, vfmt->ColorP4ui);
SET_ColorP3uiv(tab, vfmt->ColorP3uiv);
SET_ColorP4uiv(tab, vfmt->ColorP4uiv);
SET_SecondaryColorP3ui(tab, vfmt->SecondaryColorP3ui);
SET_SecondaryColorP3uiv(tab, vfmt->SecondaryColorP3uiv);
SET_VertexAttribP1ui(tab, vfmt->VertexAttribP1ui);
SET_VertexAttribP2ui(tab, vfmt->VertexAttribP2ui);
SET_VertexAttribP3ui(tab, vfmt->VertexAttribP3ui);
SET_VertexAttribP4ui(tab, vfmt->VertexAttribP4ui);
SET_VertexAttribP1uiv(tab, vfmt->VertexAttribP1uiv);
SET_VertexAttribP2uiv(tab, vfmt->VertexAttribP2uiv);
SET_VertexAttribP3uiv(tab, vfmt->VertexAttribP3uiv);
SET_VertexAttribP4uiv(tab, vfmt->VertexAttribP4uiv);
}
reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c
+2 -28
View File
@@ -44,32 +44,6 @@ _swrast_use_fragment_program(struct gl_context *ctx)
&& fp->Base.NumInstructions == 0);
}
/**
* Apply texture object's swizzle (X/Y/Z/W/0/1) to incoming 'texel'
* and return results in 'colorOut'.
*/
static inline void
swizzle_texel(const GLfloat texel[4], GLfloat colorOut[4], GLuint swizzle)
{
if (swizzle == SWIZZLE_NOOP) {
COPY_4V(colorOut, texel);
}
else {
GLfloat vector[6];
vector[SWIZZLE_X] = texel[0];
vector[SWIZZLE_Y] = texel[1];
vector[SWIZZLE_Z] = texel[2];
vector[SWIZZLE_W] = texel[3];
vector[SWIZZLE_ZERO] = 0.0F;
vector[SWIZZLE_ONE] = 1.0F;
colorOut[0] = vector[GET_SWZ(swizzle, 0)];
colorOut[1] = vector[GET_SWZ(swizzle, 1)];
colorOut[2] = vector[GET_SWZ(swizzle, 2)];
colorOut[3] = vector[GET_SWZ(swizzle, 3)];
}
}
/**
* Fetch a texel with given lod.
* Called via machine->FetchTexelLod()
@@ -89,7 +63,7 @@ fetch_texel_lod( struct gl_context *ctx, const GLfloat texcoord[4], GLfloat lamb
swrast->TextureSample[unit](ctx, texObj, 1,
(const GLfloat (*)[4]) texcoord,
&lambda, &rgba);
swizzle_texel(rgba, color, texObj->_Swizzle);
COPY_4V(color, rgba);
}
else {
ASSIGN_4V(color, 0.0F, 0.0F, 0.0F, 1.0F);
@@ -137,7 +111,7 @@ fetch_texel_deriv( struct gl_context *ctx, const GLfloat texcoord[4],
swrast->TextureSample[unit](ctx, texObj, 1,
(const GLfloat (*)[4]) texcoord,
&lambda, &rgba);
swizzle_texel(rgba, color, texObj->_Swizzle);
COPY_4V(color, rgba);
}
else {
ASSIGN_4V(color, 0.0F, 0.0F, 0.0F, 1.0F);
reactos/dll/opengl/mesa/src/mesa/swrast/s_texcombine.c
-36
View File
@@ -557,37 +557,6 @@ end:
free(rgba);
}
/**
* Apply X/Y/Z/W/0/1 swizzle to an array of colors/texels.
* See GL_EXT_texture_swizzle.
*/
static void
swizzle_texels(GLuint swizzle, GLuint count, float4_array texels)
{
const GLuint swzR = GET_SWZ(swizzle, 0);
const GLuint swzG = GET_SWZ(swizzle, 1);
const GLuint swzB = GET_SWZ(swizzle, 2);
const GLuint swzA = GET_SWZ(swizzle, 3);
GLfloat vector[6];
GLuint i;
vector[SWIZZLE_ZERO] = 0;
vector[SWIZZLE_ONE] = 1.0F;
for (i = 0; i < count; i++) {
vector[SWIZZLE_X] = texels[i][0];
vector[SWIZZLE_Y] = texels[i][1];
vector[SWIZZLE_Z] = texels[i][2];
vector[SWIZZLE_W] = texels[i][3];
texels[i][RCOMP] = vector[swzR];
texels[i][GCOMP] = vector[swzG];
texels[i][BCOMP] = vector[swzB];
texels[i][ACOMP] = vector[swzA];
}
}
/**
* Apply texture mapping to a span of fragments.
*/
@@ -758,11 +727,6 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span )
/* Sample the texture (span->end = number of fragments) */
swrast->TextureSample[unit]( ctx, texUnit->_Current, span->end,
texcoords, lambda, texels );
/* GL_EXT_texture_swizzle */
if (curObj->_Swizzle != SWIZZLE_NOOP) {
swizzle_texels(curObj->_Swizzle, span->end, texels);
}
}
}
reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c
-1
View File
@@ -1067,7 +1067,6 @@ _swrast_choose_triangle( struct gl_context *ctx )
&& ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT
&& texObj2D->Sampler.WrapS == GL_REPEAT
&& texObj2D->Sampler.WrapT == GL_REPEAT
&& texObj2D->_Swizzle == SWIZZLE_NOOP
&& swImg->_IsPowerOfTwo
&& texImg->Border == 0
&& texImg->Width == swImg->RowStride
reactos/dll/opengl/mesa/src/mesa/vbo/vbo_attrib_tmp.h
-400
View File
@@ -59,121 +59,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] )
static inline float conv_ui10_to_norm_float(unsigned ui10)
{
return (float)(ui10) / 1023.0;
}
static inline float conv_ui2_to_norm_float(unsigned ui2)
{
return (float)(ui2) / 3.0;
}
#define ATTRUI10_1( A, UI ) ATTR( A, 1, (UI) & 0x3ff, 0, 0, 1 )
#define ATTRUI10_2( A, UI ) ATTR( A, 2, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, 0, 1 )
#define ATTRUI10_3( A, UI ) ATTR( A, 3, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, 1 )
#define ATTRUI10_4( A, UI ) ATTR( A, 4, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, ((UI) >> 30) & 0x3 )
#define ATTRUI10N_1( A, UI ) ATTR( A, 1, conv_ui10_to_norm_float((UI) & 0x3ff), 0, 0, 1 )
#define ATTRUI10N_2( A, UI ) ATTR( A, 2, \
conv_ui10_to_norm_float((UI) & 0x3ff), \
conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), 0, 1 )
#define ATTRUI10N_3( A, UI ) ATTR( A, 3, \
conv_ui10_to_norm_float((UI) & 0x3ff), \
conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \
conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), 1 )
#define ATTRUI10N_4( A, UI ) ATTR( A, 4, \
conv_ui10_to_norm_float((UI) & 0x3ff), \
conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \
conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), \
conv_ui2_to_norm_float(((UI) >> 30) & 0x3) )
struct attr_bits_10 {signed int x:10;};
struct attr_bits_2 {signed int x:2;};
static inline float conv_i10_to_i(int i10)
{
struct attr_bits_10 val;
val.x = i10;
return (float)val.x;
}
static inline float conv_i2_to_i(int i2)
{
struct attr_bits_2 val;
val.x = i2;
return (float)val.x;
}
static inline float conv_i10_to_norm_float(int i10)
{
struct attr_bits_10 val;
val.x = i10;
return (2.0F * (float)val.x + 1.0F) * (1.0F / 511.0F);
}
static inline float conv_i2_to_norm_float(int i2)
{
struct attr_bits_2 val;
val.x = i2;
return (float)val.x;
}
#define ATTRI10_1( A, I10 ) ATTR( A, 1, conv_i10_to_i((I10) & 0x3ff), 0, 0, 1 )
#define ATTRI10_2( A, I10 ) ATTR( A, 2, \
conv_i10_to_i((I10) & 0x3ff), \
conv_i10_to_i(((I10) >> 10) & 0x3ff), 0, 1 )
#define ATTRI10_3( A, I10 ) ATTR( A, 3, \
conv_i10_to_i((I10) & 0x3ff), \
conv_i10_to_i(((I10) >> 10) & 0x3ff), \
conv_i10_to_i(((I10) >> 20) & 0x3ff), 1 )
#define ATTRI10_4( A, I10 ) ATTR( A, 4, \
conv_i10_to_i((I10) & 0x3ff), \
conv_i10_to_i(((I10) >> 10) & 0x3ff), \
conv_i10_to_i(((I10) >> 20) & 0x3ff), \
conv_i2_to_i(((I10) >> 30) & 0x3))
#define ATTRI10N_1( A, I10 ) ATTR( A, 1, conv_i10_to_norm_float((I10) & 0x3ff), 0, 0, 1 )
#define ATTRI10N_2( A, I10 ) ATTR( A, 2, \
conv_i10_to_norm_float((I10) & 0x3ff), \
conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), 0, 1 )
#define ATTRI10N_3( A, I10 ) ATTR( A, 3, \
conv_i10_to_norm_float((I10) & 0x3ff), \
conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), \
conv_i10_to_norm_float(((I10) >> 20) & 0x3ff), 1 )
#define ATTRI10N_4( A, I10 ) ATTR( A, 4, \
conv_i10_to_norm_float((I10) & 0x3ff), \
conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), \
conv_i10_to_norm_float(((I10) >> 20) & 0x3ff), \
conv_i2_to_norm_float(((I10) >> 30) & 0x3))
#define ATTR_UI(val, type, normalized, attr, arg) do { \
if ((type) == GL_UNSIGNED_INT_2_10_10_10_REV) { \
if (normalized) { \
ATTRUI10N_##val((attr), (arg)); \
} else { \
ATTRUI10_##val((attr), (arg)); \
} \
} else if ((type) == GL_INT_2_10_10_10_REV) { \
if (normalized) { \
ATTRI10N_##val((attr), (arg)); \
} else { \
ATTRI10_##val((attr), (arg)); \
} \
} else \
ERROR(GL_INVALID_VALUE); \
} while(0)
#define ATTR_UI_INDEX(val, type, normalized, index, arg) do { \
if ((index) == 0) { \
ATTR_UI(val, (type), normalized, 0, (arg)); \
} else if ((index) < MAX_VERTEX_GENERIC_ATTRIBS) { \
ATTR_UI(val, (type), normalized, VBO_ATTRIB_GENERIC0 + (index), (arg)); \
} else \
ERROR(GL_INVALID_VALUE); \
} while(0)
static void GLAPIENTRY
TAG(Vertex2f)(GLfloat x, GLfloat y)
{
@@ -792,289 +677,6 @@ TAG(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)
}
static void GLAPIENTRY
TAG(VertexP2ui)(GLenum type, GLuint value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(2, type, 0, VBO_ATTRIB_POS, value);
}
static void GLAPIENTRY
TAG(VertexP2uiv)(GLenum type, const GLuint *value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(2, type, 0, VBO_ATTRIB_POS, value[0]);
}
static void GLAPIENTRY
TAG(VertexP3ui)(GLenum type, GLuint value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(3, type, 0, VBO_ATTRIB_POS, value);
}
static void GLAPIENTRY
TAG(VertexP3uiv)(GLenum type, const GLuint *value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(3, type, 0, VBO_ATTRIB_POS, value[0]);
}
static void GLAPIENTRY
TAG(VertexP4ui)(GLenum type, GLuint value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(4, type, 0, VBO_ATTRIB_POS, value);
}
static void GLAPIENTRY
TAG(VertexP4uiv)(GLenum type, const GLuint *value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(4, type, 0, VBO_ATTRIB_POS, value[0]);
}
static void GLAPIENTRY
TAG(TexCoordP1ui)(GLenum type, GLuint coords)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(1, type, 0, VBO_ATTRIB_TEX0, coords);
}
static void GLAPIENTRY
TAG(TexCoordP1uiv)(GLenum type, const GLuint *coords)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(1, type, 0, VBO_ATTRIB_TEX0, coords[0]);
}
static void GLAPIENTRY
TAG(TexCoordP2ui)(GLenum type, GLuint coords)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(2, type, 0, VBO_ATTRIB_TEX0, coords);
}
static void GLAPIENTRY
TAG(TexCoordP2uiv)(GLenum type, const GLuint *coords)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(2, type, 0, VBO_ATTRIB_TEX0, coords[0]);
}
static void GLAPIENTRY
TAG(TexCoordP3ui)(GLenum type, GLuint coords)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(3, type, 0, VBO_ATTRIB_TEX0, coords);
}
static void GLAPIENTRY
TAG(TexCoordP3uiv)(GLenum type, const GLuint *coords)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(3, type, 0, VBO_ATTRIB_TEX0, coords[0]);
}
static void GLAPIENTRY
TAG(TexCoordP4ui)(GLenum type, GLuint coords)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(4, type, 0, VBO_ATTRIB_TEX0, coords);
}
static void GLAPIENTRY
TAG(TexCoordP4uiv)(GLenum type, const GLuint *coords)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(4, type, 0, VBO_ATTRIB_TEX0, coords[0]);
}
static void GLAPIENTRY
TAG(MultiTexCoordP1ui)(GLenum target, GLenum type, GLuint coords)
{
GET_CURRENT_CONTEXT(ctx);
GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
ATTR_UI(1, type, 0, attr, coords);
}
static void GLAPIENTRY
TAG(MultiTexCoordP1uiv)(GLenum target, GLenum type, const GLuint *coords)
{
GET_CURRENT_CONTEXT(ctx);
GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
ATTR_UI(1, type, 0, attr, coords[0]);
}
static void GLAPIENTRY
TAG(MultiTexCoordP2ui)(GLenum target, GLenum type, GLuint coords)
{
GET_CURRENT_CONTEXT(ctx);
GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
ATTR_UI(2, type, 0, attr, coords);
}
static void GLAPIENTRY
TAG(MultiTexCoordP2uiv)(GLenum target, GLenum type, const GLuint *coords)
{
GET_CURRENT_CONTEXT(ctx);
GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
ATTR_UI(2, type, 0, attr, coords[0]);
}
static void GLAPIENTRY
TAG(MultiTexCoordP3ui)(GLenum target, GLenum type, GLuint coords)
{
GET_CURRENT_CONTEXT(ctx);
GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
ATTR_UI(3, type, 0, attr, coords);
}
static void GLAPIENTRY
TAG(MultiTexCoordP3uiv)(GLenum target, GLenum type, const GLuint *coords)
{
GET_CURRENT_CONTEXT(ctx);
GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
ATTR_UI(3, type, 0, attr, coords[0]);
}
static void GLAPIENTRY
TAG(MultiTexCoordP4ui)(GLenum target, GLenum type, GLuint coords)
{
GET_CURRENT_CONTEXT(ctx);
GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
ATTR_UI(4, type, 0, attr, coords);
}
static void GLAPIENTRY
TAG(MultiTexCoordP4uiv)(GLenum target, GLenum type, const GLuint *coords)
{
GET_CURRENT_CONTEXT(ctx);
GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
ATTR_UI(4, type, 0, attr, coords[0]);
}
static void GLAPIENTRY
TAG(NormalP3ui)(GLenum type, GLuint coords)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(3, type, 1, VBO_ATTRIB_NORMAL, coords);
}
static void GLAPIENTRY
TAG(NormalP3uiv)(GLenum type, const GLuint *coords)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(3, type, 1, VBO_ATTRIB_NORMAL, coords[0]);
}
static void GLAPIENTRY
TAG(ColorP3ui)(GLenum type, GLuint color)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR0, color);
}
static void GLAPIENTRY
TAG(ColorP3uiv)(GLenum type, const GLuint *color)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR0, color[0]);
}
static void GLAPIENTRY
TAG(ColorP4ui)(GLenum type, GLuint color)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(4, type, 1, VBO_ATTRIB_COLOR0, color);
}
static void GLAPIENTRY
TAG(ColorP4uiv)(GLenum type, const GLuint *color)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(4, type, 1, VBO_ATTRIB_COLOR0, color[0]);
}
static void GLAPIENTRY
TAG(SecondaryColorP3ui)(GLenum type, GLuint color)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR1, color);
}
static void GLAPIENTRY
TAG(SecondaryColorP3uiv)(GLenum type, const GLuint *color)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR1, color[0]);
}
static void GLAPIENTRY
TAG(VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized,
GLuint value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI_INDEX(1, type, normalized, index, value);
}
static void GLAPIENTRY
TAG(VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized,
GLuint value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI_INDEX(2, type, normalized, index, value);
}
static void GLAPIENTRY
TAG(VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized,
GLuint value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI_INDEX(3, type, normalized, index, value);
}
static void GLAPIENTRY
TAG(VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized,
GLuint value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI_INDEX(4, type, normalized, index, value);
}
static void GLAPIENTRY
TAG(VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized,
const GLuint *value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI_INDEX(1, type, normalized, index, *value);
}
static void GLAPIENTRY
TAG(VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized,
const GLuint *value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI_INDEX(2, type, normalized, index, *value);
}
static void GLAPIENTRY
TAG(VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized,
const GLuint *value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI_INDEX(3, type, normalized, index, *value);
}
static void GLAPIENTRY
TAG(VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized,
const GLuint *value)
{
GET_CURRENT_CONTEXT(ctx);
ATTR_UI_INDEX(4, type, normalized, index, *value);
}
#undef ATTR1FV
#undef ATTR2FV
#undef ATTR3FV
@@ -1085,6 +687,4 @@ TAG(VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized,
#undef ATTR3F
#undef ATTR4F
#undef ATTR_UI
#undef MAT
reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_api.c
-46
View File
@@ -979,52 +979,6 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
vfmt->EdgeFlag = vbo_EdgeFlag;
vfmt->Indexf = vbo_Indexf;
vfmt->Indexfv = vbo_Indexfv;
/* ARB_vertex_type_2_10_10_10_rev */
vfmt->VertexP2ui = vbo_VertexP2ui;
vfmt->VertexP2uiv = vbo_VertexP2uiv;
vfmt->VertexP3ui = vbo_VertexP3ui;
vfmt->VertexP3uiv = vbo_VertexP3uiv;
vfmt->VertexP4ui = vbo_VertexP4ui;
vfmt->VertexP4uiv = vbo_VertexP4uiv;
vfmt->TexCoordP1ui = vbo_TexCoordP1ui;
vfmt->TexCoordP1uiv = vbo_TexCoordP1uiv;
vfmt->TexCoordP2ui = vbo_TexCoordP2ui;
vfmt->TexCoordP2uiv = vbo_TexCoordP2uiv;
vfmt->TexCoordP3ui = vbo_TexCoordP3ui;
vfmt->TexCoordP3uiv = vbo_TexCoordP3uiv;
vfmt->TexCoordP4ui = vbo_TexCoordP4ui;
vfmt->TexCoordP4uiv = vbo_TexCoordP4uiv;
vfmt->MultiTexCoordP1ui = vbo_MultiTexCoordP1ui;
vfmt->MultiTexCoordP1uiv = vbo_MultiTexCoordP1uiv;
vfmt->MultiTexCoordP2ui = vbo_MultiTexCoordP2ui;
vfmt->MultiTexCoordP2uiv = vbo_MultiTexCoordP2uiv;
vfmt->MultiTexCoordP3ui = vbo_MultiTexCoordP3ui;
vfmt->MultiTexCoordP3uiv = vbo_MultiTexCoordP3uiv;
vfmt->MultiTexCoordP4ui = vbo_MultiTexCoordP4ui;
vfmt->MultiTexCoordP4uiv = vbo_MultiTexCoordP4uiv;
vfmt->NormalP3ui = vbo_NormalP3ui;
vfmt->NormalP3uiv = vbo_NormalP3uiv;
vfmt->ColorP3ui = vbo_ColorP3ui;
vfmt->ColorP3uiv = vbo_ColorP3uiv;
vfmt->ColorP4ui = vbo_ColorP4ui;
vfmt->ColorP4uiv = vbo_ColorP4uiv;
vfmt->SecondaryColorP3ui = vbo_SecondaryColorP3ui;
vfmt->SecondaryColorP3uiv = vbo_SecondaryColorP3uiv;
vfmt->VertexAttribP1ui = vbo_VertexAttribP1ui;
vfmt->VertexAttribP1uiv = vbo_VertexAttribP1uiv;
vfmt->VertexAttribP2ui = vbo_VertexAttribP2ui;
vfmt->VertexAttribP2uiv = vbo_VertexAttribP2uiv;
vfmt->VertexAttribP3ui = vbo_VertexAttribP3ui;
vfmt->VertexAttribP3uiv = vbo_VertexAttribP3uiv;
vfmt->VertexAttribP4ui = vbo_VertexAttribP4ui;
vfmt->VertexAttribP4uiv = vbo_VertexAttribP4uiv;
}
reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c
-46
View File
@@ -1352,52 +1352,6 @@ _save_vtxfmt_init(struct gl_context *ctx)
vfmt->VertexAttribI3uiv = _save_VertexAttribI3uiv;
vfmt->VertexAttribI4uiv = _save_VertexAttribI4uiv;
vfmt->VertexP2ui = _save_VertexP2ui;
vfmt->VertexP3ui = _save_VertexP3ui;
vfmt->VertexP4ui = _save_VertexP4ui;
vfmt->VertexP2uiv = _save_VertexP2uiv;
vfmt->VertexP3uiv = _save_VertexP3uiv;
vfmt->VertexP4uiv = _save_VertexP4uiv;
vfmt->TexCoordP1ui = _save_TexCoordP1ui;
vfmt->TexCoordP2ui = _save_TexCoordP2ui;
vfmt->TexCoordP3ui = _save_TexCoordP3ui;
vfmt->TexCoordP4ui = _save_TexCoordP4ui;
vfmt->TexCoordP1uiv = _save_TexCoordP1uiv;
vfmt->TexCoordP2uiv = _save_TexCoordP2uiv;
vfmt->TexCoordP3uiv = _save_TexCoordP3uiv;
vfmt->TexCoordP4uiv = _save_TexCoordP4uiv;
vfmt->MultiTexCoordP1ui = _save_MultiTexCoordP1ui;
vfmt->MultiTexCoordP2ui = _save_MultiTexCoordP2ui;
vfmt->MultiTexCoordP3ui = _save_MultiTexCoordP3ui;
vfmt->MultiTexCoordP4ui = _save_MultiTexCoordP4ui;
vfmt->MultiTexCoordP1uiv = _save_MultiTexCoordP1uiv;
vfmt->MultiTexCoordP2uiv = _save_MultiTexCoordP2uiv;
vfmt->MultiTexCoordP3uiv = _save_MultiTexCoordP3uiv;
vfmt->MultiTexCoordP4uiv = _save_MultiTexCoordP4uiv;
vfmt->NormalP3ui = _save_NormalP3ui;
vfmt->NormalP3uiv = _save_NormalP3uiv;
vfmt->ColorP3ui = _save_ColorP3ui;
vfmt->ColorP4ui = _save_ColorP4ui;
vfmt->ColorP3uiv = _save_ColorP3uiv;
vfmt->ColorP4uiv = _save_ColorP4uiv;
vfmt->SecondaryColorP3ui = _save_SecondaryColorP3ui;
vfmt->SecondaryColorP3uiv = _save_SecondaryColorP3uiv;
vfmt->VertexAttribP1ui = _save_VertexAttribP1ui;
vfmt->VertexAttribP2ui = _save_VertexAttribP2ui;
vfmt->VertexAttribP3ui = _save_VertexAttribP3ui;
vfmt->VertexAttribP4ui = _save_VertexAttribP4ui;
vfmt->VertexAttribP1uiv = _save_VertexAttribP1uiv;
vfmt->VertexAttribP2uiv = _save_VertexAttribP2uiv;
vfmt->VertexAttribP3uiv = _save_VertexAttribP3uiv;
vfmt->VertexAttribP4uiv = _save_VertexAttribP4uiv;
/* This will all require us to fallback to saving the list as opcodes:
*/
_MESA_INIT_DLIST_VTXFMT(vfmt, _save_); /* inside begin/end */