Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[akhaldi] 60491: [PSAPI_WINETEST] * Fix a typo.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Oct 1 14:59:36 2013 New Revision: 60491 URL: http://svn.reactos.org/svn/reactos?rev=60491&view=rev Log: [PSAPI_WINETEST] * Fix a typo. Modified: trunk/rostests/winetests/psapi/psapi_main.c Modified: trunk/rostests/winetests/psapi/psapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/psapi_mai… ============================================================================== --- trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] Tue Oct 1 14:59:36 2013 @@ -105,9 +105,9 @@ HMODULE hMod = GetModuleHandle(NULL); DWORD ret, cbNeeded = 0xdeadbeef; - if(!winetest_interactive) - { - win_skip("Stack corruption - ROSTEST-122\n"); + if (!winetest_interactive) + { + win_skip("Stack corruption - ROSTESTS-122\n"); return; }

10 years, 11 months

[jgardou] 60490: [MESA] - leaner build part 2 of X - Get rid of EXT_texture_swizzle and ARB_vertex_type_2_10_10_10_rev extensions

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 1 14:39:31 2013 New Revision: 60490 URL: http://svn.reactos.org/svn/reactos?rev=60490&view=rev Log: [MESA] - leaner build part 2 of X - Get rid of EXT_texture_swizzle and ARB_vertex_type_2_10_10_10_rev extensions Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h 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/texobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texcombine.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_attrib_tmp.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_api.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h [iso-8859-1] Tue Oct 1 14:39:31 2013 @@ -1047,70 +1047,6 @@ 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 ); 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 14:39:31 2013 @@ -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 @@ #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 @@ #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 @@ 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 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 14:39:31 2013 @@ -135,7 +135,6 @@ { "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 @@ { "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 @@ { "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 @@ 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 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 14:39:31 2013 @@ -1356,8 +1356,6 @@ 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 @@ 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 @@ 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; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/texobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/texobj.c [iso-8859-1] Tue Oct 1 14:39:31 2013 @@ -147,11 +147,6 @@ 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 @@ 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; } Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c [iso-8859-1] Tue Oct 1 14:39:31 2013 @@ -160,45 +160,6 @@ /** - * 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 @@ 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]; @@ -1164,27 +1084,6 @@ 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 = (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) @@ -1310,20 +1209,6 @@ 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) 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 14:39:31 2013 @@ -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 @@ 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 @@ 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 @@ 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; } @@ -178,13 +158,6 @@ } else if (size < sizeMin || size > sizeMax || size > 4) { _mesa_error(ctx, GL_INVALID_VALUE, "%s(size=%d)", func, size); - 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; } @@ -229,9 +202,7 @@ _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 @@ { 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 @@ 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); @@ -310,131 +277,125 @@ void GLAPIENTRY _mesa_SecondaryColorPointerEXT(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) +{ + const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT | + SHORT_BIT | UNSIGNED_SHORT_BIT | + INT_BIT | UNSIGNED_INT_BIT | + HALF_BIT | FLOAT_BIT | DOUBLE_BIT); + GET_CURRENT_CONTEXT(ctx); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + + update_array(ctx, "glSecondaryColorPointer", VERT_ATTRIB_COLOR1, + legalTypes, 3, BGRA_OR_4, + size, type, stride, GL_TRUE, GL_FALSE, ptr); +} + + +void GLAPIENTRY +_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride, + const GLvoid *ptr) +{ + GLbitfield legalTypes = (SHORT_BIT | INT_BIT | + HALF_BIT | FLOAT_BIT | DOUBLE_BIT | + FIXED_ES_BIT); + GET_CURRENT_CONTEXT(ctx); + const GLuint unit = ctx->Array.ActiveTexture; + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + + if (ctx->API == API_OPENGLES) + legalTypes |= BYTE_BIT; + + update_array(ctx, "glTexCoordPointer", VERT_ATTRIB_TEX(unit), + legalTypes, 1, 4, + size, type, stride, GL_FALSE, GL_FALSE, + ptr); +} + + +void GLAPIENTRY +_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr) +{ + const GLbitfield legalTypes = UNSIGNED_BYTE_BIT; + /* see table 2.4 edits in GL_EXT_gpu_shader4 spec: */ + const GLboolean integer = GL_TRUE; + GET_CURRENT_CONTEXT(ctx); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + + update_array(ctx, "glEdgeFlagPointer", VERT_ATTRIB_EDGEFLAG, + legalTypes, 1, 1, + 1, GL_UNSIGNED_BYTE, stride, GL_FALSE, integer, ptr); +} + + +void GLAPIENTRY +_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr) +{ + const GLbitfield legalTypes = (FLOAT_BIT | FIXED_ES_BIT); + GET_CURRENT_CONTEXT(ctx); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + + if (ctx->API != API_OPENGLES) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glPointSizePointer(ES 1.x only)"); + return; + } + + update_array(ctx, "glPointSizePointer", VERT_ATTRIB_POINT_SIZE, + legalTypes, 1, 1, + 1, type, stride, GL_FALSE, GL_FALSE, ptr); +} + + +#if FEATURE_NV_vertex_program +/** + * Set a vertex attribute array. + * Note that these arrays DO alias the conventional GL vertex arrays + * (position, normal, color, fog, texcoord, etc). + * The generic attribute slots at #16 and above are not touched. + */ +void GLAPIENTRY +_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type, + GLsizei stride, const GLvoid *ptr) +{ + const GLbitfield legalTypes = (UNSIGNED_BYTE_BIT | SHORT_BIT | + FLOAT_BIT | DOUBLE_BIT); + GLboolean normalized = GL_FALSE; + GET_CURRENT_CONTEXT(ctx); + ASSERT_OUTSIDE_BEGIN_END(ctx); + + if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) { + _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(index)"); + return; + } + + if (type == GL_UNSIGNED_BYTE && size != 4) { + _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(size!=4)"); + return; + } + + update_array(ctx, "glVertexAttribPointerNV", VERT_ATTRIB_GENERIC(index), + legalTypes, 1, BGRA_OR_4, + size, type, stride, normalized, GL_FALSE, ptr); +} +#endif + + +#if FEATURE_ARB_vertex_program +/** + * Set a generic vertex attribute array. + * Note that these arrays DO NOT alias the conventional GL vertex arrays + * (position, normal, color, fog, texcoord, etc). + */ +void GLAPIENTRY +_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type, + GLboolean normalized, + GLsizei stride, const GLvoid *ptr) { 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); - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - - update_array(ctx, "glSecondaryColorPointer", VERT_ATTRIB_COLOR1, - legalTypes, 3, BGRA_OR_4, - size, type, stride, GL_TRUE, GL_FALSE, ptr); -} - - -void GLAPIENTRY -_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride, - const GLvoid *ptr) -{ - 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); - GET_CURRENT_CONTEXT(ctx); - const GLuint unit = ctx->Array.ActiveTexture; - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - - if (ctx->API == API_OPENGLES) - legalTypes |= BYTE_BIT; - - update_array(ctx, "glTexCoordPointer", VERT_ATTRIB_TEX(unit), - legalTypes, 1, 4, - size, type, stride, GL_FALSE, GL_FALSE, - ptr); -} - - -void GLAPIENTRY -_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr) -{ - const GLbitfield legalTypes = UNSIGNED_BYTE_BIT; - /* see table 2.4 edits in GL_EXT_gpu_shader4 spec: */ - const GLboolean integer = GL_TRUE; - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - - update_array(ctx, "glEdgeFlagPointer", VERT_ATTRIB_EDGEFLAG, - legalTypes, 1, 1, - 1, GL_UNSIGNED_BYTE, stride, GL_FALSE, integer, ptr); -} - - -void GLAPIENTRY -_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr) -{ - const GLbitfield legalTypes = (FLOAT_BIT | FIXED_ES_BIT); - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - - if (ctx->API != API_OPENGLES) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glPointSizePointer(ES 1.x only)"); - return; - } - - update_array(ctx, "glPointSizePointer", VERT_ATTRIB_POINT_SIZE, - legalTypes, 1, 1, - 1, type, stride, GL_FALSE, GL_FALSE, ptr); -} - - -#if FEATURE_NV_vertex_program -/** - * Set a vertex attribute array. - * Note that these arrays DO alias the conventional GL vertex arrays - * (position, normal, color, fog, texcoord, etc). - * The generic attribute slots at #16 and above are not touched. - */ -void GLAPIENTRY -_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type, - GLsizei stride, const GLvoid *ptr) -{ - const GLbitfield legalTypes = (UNSIGNED_BYTE_BIT | SHORT_BIT | - FLOAT_BIT | DOUBLE_BIT); - GLboolean normalized = GL_FALSE; - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); - - if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) { - _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(index)"); - return; - } - - if (type == GL_UNSIGNED_BYTE && size != 4) { - _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(size!=4)"); - return; - } - - update_array(ctx, "glVertexAttribPointerNV", VERT_ATTRIB_GENERIC(index), - legalTypes, 1, BGRA_OR_4, - size, type, stride, normalized, GL_FALSE, ptr); -} -#endif - - -#if FEATURE_ARB_vertex_program -/** - * Set a generic vertex attribute array. - * Note that these arrays DO NOT alias the conventional GL vertex arrays - * (position, normal, color, fog, texcoord, etc). - */ -void GLAPIENTRY -_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type, - GLboolean normalized, - GLsizei stride, const GLvoid *ptr) -{ - const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT | - 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); 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 14:39:31 2013 @@ -171,9 +171,7 @@ 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; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c [iso-8859-1] Tue Oct 1 14:39:31 2013 @@ -145,53 +145,6 @@ 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); } Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c [iso-8859-1] Tue Oct 1 14:39:31 2013 @@ -45,32 +45,6 @@ } /** - * 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 @@ 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 @@ 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); Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texcombine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texcombine.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texcombine.c [iso-8859-1] Tue Oct 1 14:39:31 2013 @@ -557,37 +557,6 @@ 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 @@ /* 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); - } } } Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c [iso-8859-1] Tue Oct 1 14:39:31 2013 @@ -1067,7 +1067,6 @@ && 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 Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_attrib_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_attrib_tmp.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_attrib_tmp.h [iso-8859-1] Tue Oct 1 14:39:31 2013 @@ -59,121 +59,6 @@ #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 @@ } -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 @@ #undef ATTR3F #undef ATTR4F -#undef ATTR_UI - #undef MAT Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_api.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_api.c [iso-8859-1] Tue Oct 1 14:39:31 2013 @@ -979,52 +979,6 @@ 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; } Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c [iso-8859-1] Tue Oct 1 14:39:31 2013 @@ -1352,52 +1352,6 @@ 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 */

10 years, 11 months

[jgardou] 60489: [MESA] - Those files where not included to the commit for some obscure reason.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 1 13:34:32 2013 New Revision: 60489 URL: http://svn.reactos.org/svn/reactos?rev=60489&view=rev Log: [MESA] - Those files where not included to the commit for some obscure reason. Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.c trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.c Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.c [iso-8859-1] Tue Oct 1 13:34:32 2013 @@ -35,13 +35,6 @@ #include "texstore.h" #include "image.h" #include "macros.h" -#if 0 -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" -#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" -#else -#include "u_format_rgb9e5.h" -#include "u_format_r11g11b10f.h" -#endif static GLint @@ -675,44 +668,6 @@ const GLint blue = (rowAb0 + rowAb1 + rowBb0 + rowBb1) >> 2; const GLint alpha = (rowAa0 + rowAa1 + rowBa0 + rowBa1) >> 2; dst[i] = (alpha << 30) | (blue << 20) | (green << 10) | red; - } - } - - else if (datatype == GL_UNSIGNED_INT_5_9_9_9_REV && comps == 3) { - GLuint i, j, k; - const GLuint *rowA = (const GLuint*) srcRowA; - const GLuint *rowB = (const GLuint*) srcRowB; - GLuint *dst = (GLuint*)dstRow; - GLfloat res[3], rowAj[3], rowBj[3], rowAk[3], rowBk[3]; - for (i = j = 0, k = k0; i < (GLuint) dstWidth; - i++, j += colStride, k += colStride) { - rgb9e5_to_float3(rowA[j], rowAj); - rgb9e5_to_float3(rowB[j], rowBj); - rgb9e5_to_float3(rowA[k], rowAk); - rgb9e5_to_float3(rowB[k], rowBk); - res[0] = (rowAj[0] + rowAk[0] + rowBj[0] + rowBk[0]) * 0.25F; - res[1] = (rowAj[1] + rowAk[1] + rowBj[1] + rowBk[1]) * 0.25F; - res[2] = (rowAj[2] + rowAk[2] + rowBj[2] + rowBk[2]) * 0.25F; - dst[i] = float3_to_rgb9e5(res); - } - } - - else if (datatype == GL_UNSIGNED_INT_10F_11F_11F_REV && comps == 3) { - GLuint i, j, k; - const GLuint *rowA = (const GLuint*) srcRowA; - const GLuint *rowB = (const GLuint*) srcRowB; - GLuint *dst = (GLuint*)dstRow; - GLfloat res[3], rowAj[3], rowBj[3], rowAk[3], rowBk[3]; - for (i = j = 0, k = k0; i < (GLuint) dstWidth; - i++, j += colStride, k += colStride) { - r11g11b10f_to_float3(rowA[j], rowAj); - r11g11b10f_to_float3(rowB[j], rowBj); - r11g11b10f_to_float3(rowA[k], rowAk); - r11g11b10f_to_float3(rowB[k], rowBk); - res[0] = (rowAj[0] + rowAk[0] + rowBj[0] + rowBk[0]) * 0.25F; - res[1] = (rowAj[1] + rowAk[1] + rowBj[1] + rowBk[1]) * 0.25F; - res[2] = (rowAj[2] + rowAk[2] + rowBj[2] + rowBk[2]) * 0.25F; - dst[i] = float3_to_r11g11b10f(res); } } @@ -1338,60 +1293,6 @@ } } - else if (datatype == GL_UNSIGNED_INT_5_9_9_9_REV && comps == 3) { - DECLARE_ROW_POINTERS0(GLuint); - - GLfloat res[3]; - GLfloat rowAj[3], rowBj[3], rowCj[3], rowDj[3]; - GLfloat rowAk[3], rowBk[3], rowCk[3], rowDk[3]; - - for (i = j = 0, k = k0; i < (GLuint) dstWidth; - i++, j += colStride, k += colStride) { - rgb9e5_to_float3(rowA[j], rowAj); - rgb9e5_to_float3(rowB[j], rowBj); - rgb9e5_to_float3(rowC[j], rowCj); - rgb9e5_to_float3(rowD[j], rowDj); - rgb9e5_to_float3(rowA[k], rowAk); - rgb9e5_to_float3(rowB[k], rowBk); - rgb9e5_to_float3(rowC[k], rowCk); - rgb9e5_to_float3(rowD[k], rowDk); - res[0] = (rowAj[0] + rowAk[0] + rowBj[0] + rowBk[0] + - rowCj[0] + rowCk[0] + rowDj[0] + rowDk[0]) * 0.125F; - res[1] = (rowAj[1] + rowAk[1] + rowBj[1] + rowBk[1] + - rowCj[1] + rowCk[1] + rowDj[1] + rowDk[1]) * 0.125F; - res[2] = (rowAj[2] + rowAk[2] + rowBj[2] + rowBk[2] + - rowCj[2] + rowCk[2] + rowDj[2] + rowDk[2]) * 0.125F; - dst[i] = float3_to_rgb9e5(res); - } - } - - else if (datatype == GL_UNSIGNED_INT_10F_11F_11F_REV && comps == 3) { - DECLARE_ROW_POINTERS0(GLuint); - - GLfloat res[3]; - GLfloat rowAj[3], rowBj[3], rowCj[3], rowDj[3]; - GLfloat rowAk[3], rowBk[3], rowCk[3], rowDk[3]; - - for (i = j = 0, k = k0; i < (GLuint) dstWidth; - i++, j += colStride, k += colStride) { - r11g11b10f_to_float3(rowA[j], rowAj); - r11g11b10f_to_float3(rowB[j], rowBj); - r11g11b10f_to_float3(rowC[j], rowCj); - r11g11b10f_to_float3(rowD[j], rowDj); - r11g11b10f_to_float3(rowA[k], rowAk); - r11g11b10f_to_float3(rowB[k], rowBk); - r11g11b10f_to_float3(rowC[k], rowCk); - r11g11b10f_to_float3(rowD[k], rowDk); - res[0] = (rowAj[0] + rowAk[0] + rowBj[0] + rowBk[0] + - rowCj[0] + rowCk[0] + rowDj[0] + rowDk[0]) * 0.125F; - res[1] = (rowAj[1] + rowAk[1] + rowBj[1] + rowBk[1] + - rowCj[1] + rowCk[1] + rowDj[1] + rowDk[1]) * 0.125F; - res[2] = (rowAj[2] + rowAk[2] + rowBj[2] + rowBk[2] + - rowCj[2] + rowCk[2] + rowDj[2] + rowDk[2]) * 0.125F; - dst[i] = float3_to_r11g11b10f(res); - } - } - else if (datatype == GL_FLOAT_32_UNSIGNED_INT_24_8_REV && comps == 1) { DECLARE_ROW_POINTERS(GLfloat, 2); Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.c [iso-8859-1] Tue Oct 1 13:34:32 2013 @@ -39,13 +39,6 @@ #include "pack.h" #include "pixeltransfer.h" #include "imports.h" -#if 0 -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" -#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" -#else -#include "u_format_rgb9e5.h" -#include "u_format_r11g11b10f.h" -#endif /** @@ -1996,22 +1989,6 @@ | (IROUND(rgba[i][BCOMP] * 1023.0F) << 10) | (IROUND(rgba[i][GCOMP] * 1023.0F) << 20) | (IROUND(rgba[i][RCOMP] * 3.0F) << 30); - } - } - break; - case GL_UNSIGNED_INT_5_9_9_9_REV: - { - GLuint *dst = (GLuint *) dstAddr; - for (i = 0; i < n; i++) { - dst[i] = float3_to_rgb9e5(rgba[i]); - } - } - break; - case GL_UNSIGNED_INT_10F_11F_11F_REV: - { - GLuint *dst = (GLuint *) dstAddr; - for (i = 0; i < n; i++) { - dst[i] = float3_to_r11g11b10f(rgba[i]); } } break; @@ -2947,62 +2924,6 @@ } } break; - case GL_UNSIGNED_INT_5_9_9_9_REV: - if (swapBytes) { - const GLuint *uisrc = (const GLuint *) src; - GLuint i; - GLfloat f[3]; - for (i = 0; i < n; i ++) { - GLuint p = uisrc[i]; - SWAP4BYTE(p); - rgb9e5_to_float3(p, f); - rgba[i][rDst] = f[0]; - rgba[i][gDst] = f[1]; - rgba[i][bDst] = f[2]; - rgba[i][aDst] = 1.0F; - } - } - else { - const GLuint *uisrc = (const GLuint *) src; - GLuint i; - GLfloat f[3]; - for (i = 0; i < n; i ++) { - rgb9e5_to_float3(uisrc[i], f); - rgba[i][rDst] = f[0]; - rgba[i][gDst] = f[1]; - rgba[i][bDst] = f[2]; - rgba[i][aDst] = 1.0F; - } - } - break; - case GL_UNSIGNED_INT_10F_11F_11F_REV: - if (swapBytes) { - const GLuint *uisrc = (const GLuint *) src; - GLuint i; - GLfloat f[3]; - for (i = 0; i < n; i ++) { - GLuint p = uisrc[i]; - SWAP4BYTE(p); - r11g11b10f_to_float3(p, f); - rgba[i][rDst] = f[0]; - rgba[i][gDst] = f[1]; - rgba[i][bDst] = f[2]; - rgba[i][aDst] = 1.0F; - } - } - else { - const GLuint *uisrc = (const GLuint *) src; - GLuint i; - GLfloat f[3]; - for (i = 0; i < n; i ++) { - r11g11b10f_to_float3(uisrc[i], f); - rgba[i][rDst] = f[0]; - rgba[i][gDst] = f[1]; - rgba[i][bDst] = f[2]; - rgba[i][aDst] = 1.0F; - } - } - break; default: _mesa_problem(NULL, "bad srcType in extract float data"); break; @@ -3445,64 +3366,6 @@ rgba[i][gDst] = ((p >> 10) & 0x3ff); rgba[i][bDst] = ((p >> 20) & 0x3ff); rgba[i][aDst] = ((p >> 30) ); - } - } - break; - case GL_UNSIGNED_INT_5_9_9_9_REV: - if (swapBytes) { - const GLuint *uisrc = (const GLuint *) src; - GLuint i; - float f[3]; - for (i = 0; i < n; i ++) { - GLuint p = uisrc[i]; - SWAP4BYTE(p); - rgb9e5_to_float3(p, f); - rgba[i][rDst] = clamp_float_to_uint(f[0]); - rgba[i][gDst] = clamp_float_to_uint(f[1]); - rgba[i][bDst] = clamp_float_to_uint(f[2]); - rgba[i][aDst] = 1; - } - } - else { - const GLuint *uisrc = (const GLuint *) src; - GLuint i; - float f[3]; - for (i = 0; i < n; i ++) { - GLuint p = uisrc[i]; - rgb9e5_to_float3(p, f); - rgba[i][rDst] = clamp_float_to_uint(f[0]); - rgba[i][gDst] = clamp_float_to_uint(f[1]); - rgba[i][bDst] = clamp_float_to_uint(f[2]); - rgba[i][aDst] = 1; - } - } - break; - case GL_UNSIGNED_INT_10F_11F_11F_REV: - if (swapBytes) { - const GLuint *uisrc = (const GLuint *) src; - GLuint i; - float f[3]; - for (i = 0; i < n; i ++) { - GLuint p = uisrc[i]; - SWAP4BYTE(p); - r11g11b10f_to_float3(p, f); - rgba[i][rDst] = clamp_float_to_uint(f[0]); - rgba[i][gDst] = clamp_float_to_uint(f[1]); - rgba[i][bDst] = clamp_float_to_uint(f[2]); - rgba[i][aDst] = 1; - } - } - else { - const GLuint *uisrc = (const GLuint *) src; - GLuint i; - float f[3]; - for (i = 0; i < n; i ++) { - GLuint p = uisrc[i]; - r11g11b10f_to_float3(p, f); - rgba[i][rDst] = clamp_float_to_uint(f[0]); - rgba[i][gDst] = clamp_float_to_uint(f[1]); - rgba[i][bDst] = clamp_float_to_uint(f[2]); - rgba[i][aDst] = 1; } } break;

10 years, 11 months

[jgardou] 60488: [MESA] - leaner build part 1 of X - Get rid of some fancy formats

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 1 13:27:57 2013 New Revision: 60488 URL: http://svn.reactos.org/svn/reactos?rev=60488&view=rev Log: [MESA] - leaner build part 1 of X - Get rid of some fancy formats Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc_tmp.h trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_r11g11b10f.h trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_rgb9e5.h Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.c trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.h trunk/reactos/dll/opengl/mesa/src/mesa/main/glheader.h trunk/reactos/dll/opengl/mesa/src/mesa/main/image.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texformat.c trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch_tmp.h Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -81,7 +81,6 @@ texcompress_rgtc.c texcompress_s3tc.c texcompress_fxt1.c - texcompress_etc.c texenv.c texformat.c texgen.c 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 13:27:57 2013 @@ -170,7 +170,6 @@ { "GL_EXT_gpu_shader4", o(EXT_gpu_shader4), GL, 2006 }, { "GL_EXT_multi_draw_arrays", o(dummy_true), GL | ES1 | ES2, 1999 }, { "GL_EXT_packed_depth_stencil", o(EXT_packed_depth_stencil), GL, 2005 }, - { "GL_EXT_packed_float", o(EXT_packed_float), GL, 2004 }, { "GL_EXT_packed_pixels", o(EXT_packed_pixels), GL, 1997 }, { "GL_EXT_pixel_buffer_object", o(EXT_pixel_buffer_object), GL, 2004 }, { "GL_EXT_point_parameters", o(EXT_point_parameters), GL, 1997 }, @@ -203,7 +202,6 @@ { "GL_EXT_texture_object", o(dummy_true), GL, 1995 }, { "GL_EXT_texture", o(dummy_true), GL, 1996 }, { "GL_EXT_texture_rectangle", o(NV_texture_rectangle), GL, 2004 }, - { "GL_EXT_texture_shared_exponent", o(EXT_texture_shared_exponent), GL, 2004 }, { "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 }, @@ -219,7 +217,6 @@ { "GL_OES_blend_func_separate", o(EXT_blend_func_separate), ES1, 2009 }, { "GL_OES_blend_subtract", o(dummy_true), ES1, 2009 }, { "GL_OES_byte_coordinates", o(dummy_true), ES1, 2002 }, - { "GL_OES_compressed_ETC1_RGB8_texture", o(OES_compressed_ETC1_RGB8_texture), ES1 | ES2, 2005 }, { "GL_OES_compressed_paletted_texture", o(dummy_true), ES1, 2003 }, { "GL_OES_depth24", o(EXT_framebuffer_object), ES1 | ES2, 2005 }, { "GL_OES_depth32", o(dummy_false), DISABLE, 2005 }, @@ -478,7 +475,6 @@ ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE; ctx->Extensions.EXT_texture_filter_anisotropic = GL_TRUE; ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE; - ctx->Extensions.EXT_texture_shared_exponent = GL_TRUE; #if FEATURE_EXT_texture_sRGB ctx->Extensions.EXT_texture_sRGB = GL_TRUE; ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -461,15 +461,8 @@ fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED; return; - default: - switch (rb->Format) { - /* XXX This list is likely incomplete. */ - case MESA_FORMAT_RGB9_E5_FLOAT: - fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED; - return; - default:; - /* render buffer format is supported by software rendering */ - } + default:; + /* render buffer format is supported by software rendering */ } } } @@ -1234,10 +1227,6 @@ case GL_INTENSITY32F_ARB: return ctx->Extensions.ARB_texture_float && ctx->Extensions.ARB_framebuffer_object ? GL_INTENSITY : 0; - case GL_RGB9_E5: - return ctx->Extensions.EXT_texture_shared_exponent ? GL_RGB : 0; - case GL_R11F_G11F_B10F: - return ctx->Extensions.EXT_packed_float ? GL_RGB : 0; case GL_RGBA8UI_EXT: case GL_RGBA16UI_EXT: Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -38,13 +38,6 @@ #include "colormac.h" #include "format_pack.h" #include "macros.h" -#if 0 -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" -#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" -#else -#include "u_format_rgb9e5.h" -#include "u_format_r11g11b10f.h" -#endif typedef void (*pack_ubyte_rgba_row_func)(GLuint n, @@ -1590,53 +1583,6 @@ GLshort l = FLOAT_TO_SHORT(CLAMP(src[RCOMP], -1.0f, 1.0f)); GLshort a = FLOAT_TO_SHORT(CLAMP(src[ACOMP], -1.0f, 1.0f)); *d = PACK_COLOR_1616(a, l); -} - - -/* - * MESA_FORMAT_RGB9_E5_FLOAT; - */ - -static void -pack_float_RGB9_E5_FLOAT(const GLfloat src[4], void *dst) -{ - GLuint *d = (GLuint *) dst; - *d = float3_to_rgb9e5(src); -} - -static void -pack_ubyte_RGB9_E5_FLOAT(const GLubyte src[4], void *dst) -{ - GLuint *d = (GLuint *) dst; - GLfloat rgb[3]; - rgb[0] = UBYTE_TO_FLOAT(src[RCOMP]); - rgb[1] = UBYTE_TO_FLOAT(src[GCOMP]); - rgb[2] = UBYTE_TO_FLOAT(src[BCOMP]); - *d = float3_to_rgb9e5(rgb); -} - - - -/* - * MESA_FORMAT_R11_G11_B10_FLOAT; - */ - -static void -pack_ubyte_R11_G11_B10_FLOAT(const GLubyte src[4], void *dst) -{ - GLuint *d = (GLuint *) dst; - GLfloat rgb[3]; - rgb[0] = UBYTE_TO_FLOAT(src[RCOMP]); - rgb[1] = UBYTE_TO_FLOAT(src[GCOMP]); - rgb[2] = UBYTE_TO_FLOAT(src[BCOMP]); - *d = float3_to_r11g11b10f(rgb); -} - -static void -pack_float_R11_G11_B10_FLOAT(const GLfloat src[4], void *dst) -{ - GLuint *d = (GLuint *) dst; - *d = float3_to_r11g11b10f(src); } @@ -1774,9 +1720,6 @@ table[MESA_FORMAT_RGBA_16] = pack_ubyte_RGBA_16; - table[MESA_FORMAT_RGB9_E5_FLOAT] = pack_ubyte_RGB9_E5_FLOAT; - table[MESA_FORMAT_R11_G11_B10_FLOAT] = pack_ubyte_R11_G11_B10_FLOAT; - initialized = GL_TRUE; } @@ -1915,8 +1858,6 @@ table[MESA_FORMAT_SIGNED_AL1616] = pack_float_SIGNED_AL1616; table[MESA_FORMAT_SIGNED_I16] = pack_float_SIGNED_L16; /* reused */ - table[MESA_FORMAT_RGB9_E5_FLOAT] = pack_float_RGB9_E5_FLOAT; - table[MESA_FORMAT_R11_G11_B10_FLOAT] = pack_float_R11_G11_B10_FLOAT; initialized = GL_TRUE; } Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -25,13 +25,6 @@ #include "colormac.h" #include "format_unpack.h" #include "macros.h" -#if 0 -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" -#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" -#else -#include "u_format_rgb9e5.h" -#include "u_format_r11g11b10f.h" -#endif @@ -1315,12 +1308,6 @@ } static void -unpack_ETC1_RGB8(const void *src, GLfloat dst[][4], GLuint n) -{ - /* XXX to do */ -} - -static void unpack_SIGNED_A8(const void *src, GLfloat dst[][4], GLuint n) { const GLbyte *s = ((const GLbyte *) src); @@ -1421,28 +1408,6 @@ dst[i][GCOMP] = dst[i][BCOMP] = dst[i][ACOMP] = SHORT_TO_FLOAT_TEX( s[i] ); - } -} - -static void -unpack_RGB9_E5_FLOAT(const void *src, GLfloat dst[][4], GLuint n) -{ - const GLuint *s = (const GLuint *) src; - GLuint i; - for (i = 0; i < n; i++) { - rgb9e5_to_float3(s[i], dst[i]); - dst[i][ACOMP] = 1.0F; - } -} - -static void -unpack_R11_G11_B10_FLOAT(const void *src, GLfloat dst[][4], GLuint n) -{ - const GLuint *s = (const GLuint *) src; - GLuint i; - for (i = 0; i < n; i++) { - r11g11b10f_to_float3(s[i], dst[i]); - dst[i][ACOMP] = 1.0F; } } @@ -1567,8 +1532,6 @@ table[MESA_FORMAT_LA_LATC2] = unpack_LA_LATC2; table[MESA_FORMAT_SIGNED_LA_LATC2] = unpack_SIGNED_LA_LATC2; - table[MESA_FORMAT_ETC1_RGB8] = unpack_ETC1_RGB8; - table[MESA_FORMAT_SIGNED_A8] = unpack_SIGNED_A8; table[MESA_FORMAT_SIGNED_L8] = unpack_SIGNED_L8; table[MESA_FORMAT_SIGNED_AL88] = unpack_SIGNED_AL88; @@ -1577,9 +1540,6 @@ table[MESA_FORMAT_SIGNED_L16] = unpack_SIGNED_L16; table[MESA_FORMAT_SIGNED_AL1616] = unpack_SIGNED_AL1616; table[MESA_FORMAT_SIGNED_I16] = unpack_SIGNED_I16; - - table[MESA_FORMAT_RGB9_E5_FLOAT] = unpack_RGB9_E5_FLOAT; - table[MESA_FORMAT_R11_G11_B10_FLOAT] = unpack_R11_G11_B10_FLOAT; table[MESA_FORMAT_Z32_FLOAT] = unpack_Z32_FLOAT; table[MESA_FORMAT_Z32_FLOAT_X24S8] = unpack_Z32_FLOAT_X24S8; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -1387,16 +1387,6 @@ 4, 4, 16 /* 16 bytes per 4x4 block */ }, - { - MESA_FORMAT_ETC1_RGB8, - "MESA_FORMAT_ETC1_RGB8", - GL_RGB, - GL_UNSIGNED_NORMALIZED, - 8, 8, 8, 0, - 0, 0, 0, 0, 0, - 4, 4, 8 /* 8 bytes per 4x4 block */ - }, - /* Signed formats from EXT_texture_snorm that are not in GL3.1 */ { MESA_FORMAT_SIGNED_A8, @@ -1469,24 +1459,6 @@ 0, 0, 0, 0, 0, 16, 0, 0, 0, 1, 1, 2 - }, - { - MESA_FORMAT_RGB9_E5_FLOAT, - "MESA_FORMAT_RGB9_E5", - GL_RGB, - GL_FLOAT, - 9, 9, 9, 0, - 0, 0, 0, 0, 0, - 1, 1, 4 - }, - { - MESA_FORMAT_R11_G11_B10_FLOAT, - "MESA_FORMAT_R11_G11_B10_FLOAT", - GL_RGB, - GL_FLOAT, - 11, 11, 10, 0, - 0, 0, 0, 0, 0, - 1, 1, 4 }, /* ARB_depth_buffer_float */ { @@ -1818,8 +1790,6 @@ return MESA_FORMAT_AL88; case MESA_FORMAT_SIGNED_LA_LATC2: return MESA_FORMAT_SIGNED_AL88; - case MESA_FORMAT_ETC1_RGB8: - return MESA_FORMAT_RGB888; default: #ifdef DEBUG assert(!_mesa_is_format_compressed(format)); @@ -2270,7 +2240,6 @@ case MESA_FORMAT_SIGNED_L_LATC1: case MESA_FORMAT_LA_LATC2: case MESA_FORMAT_SIGNED_LA_LATC2: - case MESA_FORMAT_ETC1_RGB8: /* XXX generate error instead? */ *datatype = GL_UNSIGNED_BYTE; *comps = 0; @@ -2480,16 +2449,6 @@ case MESA_FORMAT_RGBA_UINT32: *datatype = GL_UNSIGNED_INT; *comps = 4; - return; - - case MESA_FORMAT_RGB9_E5_FLOAT: - *datatype = GL_UNSIGNED_INT_5_9_9_9_REV; - *comps = 3; - return; - - case MESA_FORMAT_R11_G11_B10_FLOAT: - *datatype = GL_UNSIGNED_INT_10F_11F_11F_REV; - *comps = 3; return; case MESA_FORMAT_ARGB2101010_UINT: @@ -2808,9 +2767,6 @@ case MESA_FORMAT_SIGNED_LA_LATC2: return GL_FALSE; - case MESA_FORMAT_ETC1_RGB8: - return GL_FALSE; - case MESA_FORMAT_SIGNED_A8: case MESA_FORMAT_SIGNED_L8: case MESA_FORMAT_SIGNED_AL88: @@ -2825,11 +2781,6 @@ case MESA_FORMAT_ARGB2101010_UINT: return GL_FALSE; - case MESA_FORMAT_RGB9_E5_FLOAT: - return format == GL_RGB && type == GL_UNSIGNED_INT_5_9_9_9_REV; - case MESA_FORMAT_R11_G11_B10_FLOAT: - return format == GL_RGB && type == GL_UNSIGNED_INT_10F_11F_11F_REV; - case MESA_FORMAT_Z32_FLOAT: return format == GL_DEPTH_COMPONENT && type == GL_FLOAT; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.h [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -258,8 +258,6 @@ MESA_FORMAT_SIGNED_LA_LATC2, /*@}*/ - MESA_FORMAT_ETC1_RGB8, - MESA_FORMAT_SIGNED_A8, /* AAAA AAAA */ MESA_FORMAT_SIGNED_L8, /* LLLL LLLL */ MESA_FORMAT_SIGNED_AL88, /* AAAA AAAA LLLL LLLL */ @@ -269,9 +267,6 @@ MESA_FORMAT_SIGNED_AL1616, /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */ MESA_FORMAT_SIGNED_I16, /* IIII IIII IIII IIII */ - MESA_FORMAT_RGB9_E5_FLOAT, - MESA_FORMAT_R11_G11_B10_FLOAT, - MESA_FORMAT_Z32_FLOAT, MESA_FORMAT_Z32_FLOAT_X24S8, Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/glheader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/glheader.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/glheader.h [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -139,10 +139,6 @@ #define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 #endif -#ifndef GL_OES_compressed_ETC1_RGB8_texture -#define GL_ETC1_RGB8_OES 0x8D64 -#endif - /** * Internal token to represent a GLSL shader program (a collection of Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/image.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -428,15 +428,6 @@ } return GL_NO_ERROR; - case GL_UNSIGNED_INT_10F_11F_11F_REV: - if (!ctx->Extensions.EXT_packed_float) { - return GL_INVALID_ENUM; - } - if (format != GL_RGB) { - return GL_INVALID_OPERATION; - } - return GL_NO_ERROR; - default: ; /* fall-through */ } @@ -523,12 +514,6 @@ return GL_NO_ERROR; case GL_HALF_FLOAT: return ctx->Extensions.ARB_half_float_pixel - ? GL_NO_ERROR : GL_INVALID_ENUM; - case GL_UNSIGNED_INT_5_9_9_9_REV: - return ctx->Extensions.EXT_texture_shared_exponent - ? GL_NO_ERROR : GL_INVALID_ENUM; - case GL_UNSIGNED_INT_10F_11F_11F_REV: - return ctx->Extensions.EXT_packed_float ? GL_NO_ERROR : GL_INVALID_ENUM; default: return GL_INVALID_ENUM; @@ -848,7 +833,6 @@ case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT: case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT: case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI: - case GL_ETC1_RGB8_OES: /* generic integer formats */ case GL_RED_INTEGER_EXT: case GL_GREEN_INTEGER_EXT: @@ -935,7 +919,6 @@ case GL_INTENSITY_SNORM: case GL_INTENSITY8_SNORM: case GL_INTENSITY16_SNORM: - case GL_RGB9_E5: case GL_R11F_G11F_B10F: case GL_RGB10_A2UI: return GL_TRUE; @@ -1172,8 +1155,6 @@ return ctx->Extensions.EXT_texture_compression_latc; case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI: return ctx->Extensions.ATI_texture_compression_3dc; - case GL_ETC1_RGB8_OES: - return ctx->Extensions.OES_compressed_ETC1_RGB8_texture; #if FEATURE_ES case GL_PALETTE4_RGB8_OES: case GL_PALETTE4_RGBA8_OES: 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 13:27:57 2013 @@ -2928,7 +2928,6 @@ GLboolean EXT_gpu_program_parameters; GLboolean EXT_gpu_shader4; GLboolean EXT_packed_depth_stencil; - GLboolean EXT_packed_float; GLboolean EXT_packed_pixels; GLboolean EXT_pixel_buffer_object; GLboolean EXT_point_parameters; @@ -2947,7 +2946,6 @@ GLboolean EXT_texture_filter_anisotropic; GLboolean EXT_texture_integer; GLboolean EXT_texture_mirror_clamp; - GLboolean EXT_texture_shared_exponent; GLboolean EXT_texture_snorm; GLboolean EXT_texture_sRGB; GLboolean EXT_texture_sRGB_decode; @@ -2993,7 +2991,6 @@ GLboolean OES_EGL_image; GLboolean OES_draw_texture; GLboolean OES_EGL_image_external; - GLboolean OES_compressed_ETC1_RGB8_texture; GLboolean extension_sentinel; /** The extension string */ const GLubyte *String; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -40,7 +40,6 @@ #include "texcompress_fxt1.h" #include "texcompress_rgtc.h" #include "texcompress_s3tc.h" -#include "texcompress_etc.h" #include "swrast/s_context.h" @@ -91,7 +90,6 @@ case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: case GL_COMPRESSED_RGB_FXT1_3DFX: case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: - case GL_ETC1_RGB8_OES: return GL_RGB; case GL_COMPRESSED_RGBA: @@ -266,15 +264,6 @@ } } - if (ctx->Extensions.OES_compressed_ETC1_RGB8_texture) { - if (formats) { - formats[n++] = GL_ETC1_RGB8_OES; - } - else { - n += 1; - } - } - #if FEATURE_ES1 if (ctx->API == API_OPENGLES) { if (formats) { @@ -351,9 +340,6 @@ return MESA_FORMAT_LA_LATC2; case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT: return MESA_FORMAT_SIGNED_LA_LATC2; - - case GL_ETC1_RGB8_OES: - return MESA_FORMAT_ETC1_RGB8; default: return MESA_FORMAT_NONE; @@ -420,9 +406,6 @@ case MESA_FORMAT_SIGNED_LA_LATC2: return GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT; - case MESA_FORMAT_ETC1_RGB8: - return GL_ETC1_RGB8_OES; - default: _mesa_problem(ctx, "Unexpected mesa texture format in" " _mesa_compressed_format_to_glenum()"); @@ -532,11 +515,6 @@ fetch = _mesa_fetch_texel_2d_f_signed_la_latc2; break; - /* ETC1 formats */ - case MESA_FORMAT_ETC1_RGB8: - fetch = _mesa_fetch_texel_2d_f_etc1_rgb8; - break; - default: _mesa_problem(NULL, "Unexpected format in _mesa_decompress_image()"); return; Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc.c (removed) @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2011 LunarG, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -/** - * \file texcompress_etc.c - * GL_OES_compressed_ETC1_RGB8_texture support. - */ - - -#include "mfeatures.h" -#include "texcompress.h" -#include "texcompress_etc.h" -#include "texstore.h" -#include "macros.h" -#include "swrast/s_context.h" - -GLboolean -_mesa_texstore_etc1_rgb8(TEXSTORE_PARAMS) -{ - /* GL_ETC1_RGB8_OES is only valid in glCompressedTexImage2D */ - ASSERT(0); - - return GL_FALSE; -} - -/* define etc1_parse_block and etc. */ -#define UINT8_TYPE GLubyte -#define TAG(x) x -#include "texcompress_etc_tmp.h" -#undef TAG -#undef UINT8_TYPE - -void -_mesa_fetch_texel_2d_f_etc1_rgb8(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel) -{ - struct etc1_block block; - GLubyte dst[3]; - const GLubyte *src; - - src = (const GLubyte *) texImage->Map + - (((texImage->RowStride + 3) / 4) * (j / 4) + (i / 4)) * 8; - - etc1_parse_block(&block, src); - etc1_fetch_texel(&block, i % 4, j % 4, dst); - - texel[RCOMP] = UBYTE_TO_FLOAT(dst[0]); - texel[GCOMP] = UBYTE_TO_FLOAT(dst[1]); - texel[BCOMP] = UBYTE_TO_FLOAT(dst[2]); - texel[ACOMP] = 1.0f; -} Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc.h (removed) @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2011 LunarG, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef TEXCOMPRESS_ETC1_H -#define TEXCOMPRESS_ETC1_H - -#include "glheader.h" -#include "mfeatures.h" -#include "texstore.h" - -struct swrast_texture_image; - -extern GLboolean -_mesa_texstore_etc1_rgb8(TEXSTORE_PARAMS); - -extern void -_mesa_fetch_texel_2d_f_etc1_rgb8(const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel); - -#endif Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc_tmp.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_etc_tmp.h (removed) @@ -1,136 +0,0 @@ -/* - * Copyright (C) 2011 LunarG, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -/* - * Included by texcompress_etc1 and gallium to define ETC1 decoding routines. - */ - -struct TAG(etc1_block) { - uint32_t pixel_indices; - int flipped; - const int *modifier_tables[2]; - UINT8_TYPE base_colors[2][3]; -}; - -static UINT8_TYPE -TAG(etc1_base_color_diff_hi)(UINT8_TYPE in) -{ - return (in & 0xf8) | (in >> 5); -} - -static UINT8_TYPE -TAG(etc1_base_color_diff_lo)(UINT8_TYPE in) -{ - static const int lookup[8] = { 0, 1, 2, 3, -4, -3, -2, -1 }; - - in = (in >> 3) + lookup[in & 0x7]; - - return (in << 3) | (in >> 2); -} - -static UINT8_TYPE -TAG(etc1_base_color_ind_hi)(UINT8_TYPE in) -{ - return (in & 0xf0) | ((in & 0xf0) >> 4); -} - -static UINT8_TYPE -TAG(etc1_base_color_ind_lo)(UINT8_TYPE in) -{ - return ((in & 0xf) << 4) | (in & 0xf); -} - -static UINT8_TYPE -TAG(etc1_clamp)(UINT8_TYPE base, int modifier) -{ - int tmp = (int) base + modifier; - - /* CLAMP(tmp, 0, 255) */ - return (UINT8_TYPE) ((tmp < 0) ? 0 : ((tmp > 255) ? 255 : tmp)); -} - -static const int TAG(etc1_modifier_tables)[8][4] = { - { 2, 8, -2, -8}, - { 5, 17, -5, -17}, - { 9, 29, -9, -29}, - { 13, 42, -13, -42}, - { 18, 60, -18, -60}, - { 24, 80, -24, -80}, - { 33, 106, -33, -106}, - { 47, 183, -47, -183} -}; - -static void -TAG(etc1_parse_block)(struct TAG(etc1_block) *block, const UINT8_TYPE *src) -{ - if (src[3] & 0x2) { - /* differential mode */ - block->base_colors[0][0] = (int) TAG(etc1_base_color_diff_hi)(src[0]); - block->base_colors[1][0] = (int) TAG(etc1_base_color_diff_lo)(src[0]); - block->base_colors[0][1] = (int) TAG(etc1_base_color_diff_hi)(src[1]); - block->base_colors[1][1] = (int) TAG(etc1_base_color_diff_lo)(src[1]); - block->base_colors[0][2] = (int) TAG(etc1_base_color_diff_hi)(src[2]); - block->base_colors[1][2] = (int) TAG(etc1_base_color_diff_lo)(src[2]); - } - else { - /* individual mode */ - block->base_colors[0][0] = (int) TAG(etc1_base_color_ind_hi)(src[0]); - block->base_colors[1][0] = (int) TAG(etc1_base_color_ind_lo)(src[0]); - block->base_colors[0][1] = (int) TAG(etc1_base_color_ind_hi)(src[1]); - block->base_colors[1][1] = (int) TAG(etc1_base_color_ind_lo)(src[1]); - block->base_colors[0][2] = (int) TAG(etc1_base_color_ind_hi)(src[2]); - block->base_colors[1][2] = (int) TAG(etc1_base_color_ind_lo)(src[2]); - } - - /* pick modifier tables */ - block->modifier_tables[0] = TAG(etc1_modifier_tables)[(src[3] >> 5) & 0x7]; - block->modifier_tables[1] = TAG(etc1_modifier_tables)[(src[3] >> 2) & 0x7]; - - block->flipped = (src[3] & 0x1); - - block->pixel_indices = - (src[4] << 24) | (src[5] << 16) | (src[6] << 8) | src[7]; -} - -static void -TAG(etc1_fetch_texel)(const struct TAG(etc1_block) *block, - int x, int y, UINT8_TYPE *dst) -{ - const UINT8_TYPE *base_color; - int modifier, bit, idx, blk; - - /* get pixel index */ - bit = y + x * 4; - idx = ((block->pixel_indices >> (15 + bit)) & 0x2) | - ((block->pixel_indices >> (bit)) & 0x1); - - /* get subblock */ - blk = (block->flipped) ? (y >= 2) : (x >= 2); - - base_color = block->base_colors[blk]; - modifier = block->modifier_tables[blk][idx]; - - dst[0] = TAG(etc1_clamp)(base_color[0], modifier); - dst[1] = TAG(etc1_clamp)(base_color[1], modifier); - dst[2] = TAG(etc1_clamp)(base_color[2], modifier); -} Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/texformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/texformat.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -393,26 +393,6 @@ } } - if (ctx->Extensions.EXT_texture_shared_exponent) { - switch (internalFormat) { - case GL_RGB9_E5: - ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_RGB9_E5_FLOAT]); - return MESA_FORMAT_RGB9_E5_FLOAT; - default: - ; /* fallthrough */ - } - } - - if (ctx->Extensions.EXT_packed_float) { - switch (internalFormat) { - case GL_R11F_G11F_B10F: - ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_R11_G11_B10_FLOAT]); - return MESA_FORMAT_R11_G11_B10_FLOAT; - default: - ; /* fallthrough */ - } - } - if (ctx->Extensions.EXT_packed_depth_stencil) { switch (internalFormat) { case GL_DEPTH_STENCIL_EXT: @@ -943,16 +923,6 @@ } } - if (ctx->Extensions.OES_compressed_ETC1_RGB8_texture) { - switch (internalFormat) { - case GL_ETC1_RGB8_OES: - RETURN_IF_SUPPORTED(MESA_FORMAT_ETC1_RGB8); - break; - default: - ; /* fallthrough */ - } - } - _mesa_problem(ctx, "unexpected format %s in _mesa_choose_tex_format()", _mesa_lookup_enum_by_nr(internalFormat)); return MESA_FORMAT_NONE; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -435,24 +435,6 @@ } } - if (ctx->Extensions.EXT_texture_shared_exponent) { - switch (internalFormat) { - case GL_RGB9_E5_EXT: - return GL_RGB; - default: - ; /* fallthrough */ - } - } - - if (ctx->Extensions.EXT_packed_float) { - switch (internalFormat) { - case GL_R11F_G11F_B10F_EXT: - return GL_RGB; - default: - ; /* fallthrough */ - } - } - if (ctx->Extensions.ARB_depth_buffer_float) { switch (internalFormat) { case GL_DEPTH_COMPONENT32F: @@ -494,15 +476,6 @@ switch (internalFormat) { case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI: return GL_LUMINANCE_ALPHA; - default: - ; /* fallthrough */ - } - } - - if (ctx->Extensions.OES_compressed_ETC1_RGB8_texture) { - switch (internalFormat) { - case GL_ETC1_RGB8_OES: - return GL_RGB; default: ; /* fallthrough */ } @@ -1381,21 +1354,6 @@ /** - * Return true if the format is only valid for glCompressedTexImage. - */ -static GLboolean -compressedteximage_only_format(const struct gl_context *ctx, GLenum format) -{ - switch (format) { - case GL_ETC1_RGB8_OES: - return GL_TRUE; - default: - return GL_FALSE; - } -} - - -/** * Helper function to determine whether a target and specific compression * format are supported. */ @@ -1740,11 +1698,6 @@ "glTexImage%dD(target)", dimensions); return GL_TRUE; } - if (compressedteximage_only_format(ctx, internalFormat)) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glTexImage%dD(no compression for format)", dimensions); - return GL_TRUE; - } if (border != 0) { if (!isProxy) { _mesa_error(ctx, GL_INVALID_OPERATION, @@ -1897,12 +1850,6 @@ if (_mesa_is_format_compressed(destTex->TexFormat)) { GLuint bw, bh; - if (compressedteximage_only_format(ctx, destTex->InternalFormat)) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glTexSubImage%dD(no compression for format)", dimensions); - return GL_TRUE; - } - /* do tests which depend on compression block size */ _mesa_get_format_block_size(destTex->TexFormat, &bw, &bh); @@ -2069,11 +2016,6 @@ "glCopyTexImage%dD(target)", dimensions); return GL_TRUE; } - if (compressedteximage_only_format(ctx, internalFormat)) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glCopyTexImage%dD(no compression for format)", dimensions); - return GL_TRUE; - } if (border != 0) { _mesa_error(ctx, GL_INVALID_OPERATION, "glCopyTexImage%dD(border!=0)", dimensions); @@ -2220,11 +2162,6 @@ } if (_mesa_is_format_compressed(teximage->TexFormat)) { - if (compressedteximage_only_format(ctx, teximage->InternalFormat)) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glCopyTexSubImage%dD(no compression for format)", dimensions); - return GL_TRUE; - } /* offset must be multiple of 4 */ if ((xoffset & 3) || (yoffset & 3)) { _mesa_error(ctx, GL_INVALID_VALUE, @@ -3429,13 +3366,6 @@ if ((GLint) format != texImage->InternalFormat) { _mesa_error(ctx, GL_INVALID_OPERATION, "glCompressedTexSubImage%uD(format=0x%x)", dims, format); - return GL_TRUE; - } - - if (compressedteximage_only_format(ctx, format)) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glCompressedTexSubImage%uD(format=0x%x cannot be updated)" - , dims, format); return GL_TRUE; } Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -1014,12 +1014,6 @@ !ctx->Extensions.ARB_framebuffer_object) goto invalid_pname; *params = _mesa_get_format_bits(texFormat, pname); - break; - case GL_TEXTURE_SHARED_SIZE: - if (ctx->VersionMajor < 3 && - !ctx->Extensions.EXT_texture_shared_exponent) - goto invalid_pname; - *params = texFormat == MESA_FORMAT_RGB9_E5_FLOAT ? 5 : 0; break; /* GL_ARB_texture_compression */ Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -67,17 +67,9 @@ #include "texcompress_fxt1.h" #include "texcompress_rgtc.h" #include "texcompress_s3tc.h" -#include "texcompress_etc.h" #include "teximage.h" #include "texstore.h" #include "enums.h" -#if 0 -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" -#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" -#else -#include "u_format_rgb9e5.h" -#include "u_format_r11g11b10f.h" -#endif enum { @@ -3957,105 +3949,6 @@ #define _mesa_texstore_sla8 NULL #endif /* FEATURE_EXT_texture_sRGB */ - -static GLboolean -_mesa_texstore_rgb9_e5(TEXSTORE_PARAMS) -{ - const GLenum baseFormat = _mesa_get_format_base_format(dstFormat); - - ASSERT(dstFormat == MESA_FORMAT_RGB9_E5_FLOAT); - ASSERT(baseInternalFormat == GL_RGB); - - if (!ctx->_ImageTransferState && - !srcPacking->SwapBytes && - srcFormat == GL_RGB && - srcType == GL_UNSIGNED_INT_5_9_9_9_REV) { - /* simple memcpy path */ - memcpy_texture(ctx, dims, - dstFormat, - dstRowStride, dstSlices, - srcWidth, srcHeight, srcDepth, srcFormat, srcType, - srcAddr, srcPacking); - } - else { - /* general path */ - const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims, - baseInternalFormat, - baseFormat, - srcWidth, srcHeight, srcDepth, - srcFormat, srcType, srcAddr, - srcPacking, - ctx->_ImageTransferState); - const GLfloat *srcRow = tempImage; - GLint img, row, col; - if (!tempImage) - return GL_FALSE; - for (img = 0; img < srcDepth; img++) { - GLubyte *dstRow = dstSlices[img]; - for (row = 0; row < srcHeight; row++) { - GLuint *dstUI = (GLuint*)dstRow; - for (col = 0; col < srcWidth; col++) { - dstUI[col] = float3_to_rgb9e5(&srcRow[col * 3]); - } - dstRow += dstRowStride; - srcRow += srcWidth * 3; - } - } - - free((void *) tempImage); - } - return GL_TRUE; -} - -static GLboolean -_mesa_texstore_r11_g11_b10f(TEXSTORE_PARAMS) -{ - const GLenum baseFormat = _mesa_get_format_base_format(dstFormat); - - ASSERT(dstFormat == MESA_FORMAT_R11_G11_B10_FLOAT); - ASSERT(baseInternalFormat == GL_RGB); - - if (!ctx->_ImageTransferState && - !srcPacking->SwapBytes && - srcFormat == GL_RGB && - srcType == GL_UNSIGNED_INT_10F_11F_11F_REV) { - /* simple memcpy path */ - memcpy_texture(ctx, dims, - dstFormat, - dstRowStride, dstSlices, - srcWidth, srcHeight, srcDepth, srcFormat, srcType, - srcAddr, srcPacking); - } - else { - /* general path */ - const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims, - baseInternalFormat, - baseFormat, - srcWidth, srcHeight, srcDepth, - srcFormat, srcType, srcAddr, - srcPacking, - ctx->_ImageTransferState); - const GLfloat *srcRow = tempImage; - GLint img, row, col; - if (!tempImage) - return GL_FALSE; - for (img = 0; img < srcDepth; img++) { - GLubyte *dstRow = dstSlices[img]; - for (row = 0; row < srcHeight; row++) { - GLuint *dstUI = (GLuint*)dstRow; - for (col = 0; col < srcWidth; col++) { - dstUI[col] = float3_to_r11g11b10f(&srcRow[col * 3]); - } - dstRow += dstRowStride; - srcRow += srcWidth * 3; - } - } - - free((void *) tempImage); - } - return GL_TRUE; -} - static GLboolean _mesa_texstore_z32f_x24s8(TEXSTORE_PARAMS) @@ -4299,7 +4192,6 @@ table[MESA_FORMAT_SIGNED_L_LATC1] = _mesa_texstore_signed_red_rgtc1; table[MESA_FORMAT_LA_LATC2] = _mesa_texstore_rg_rgtc2; table[MESA_FORMAT_SIGNED_LA_LATC2] = _mesa_texstore_signed_rg_rgtc2; - table[MESA_FORMAT_ETC1_RGB8] = _mesa_texstore_etc1_rgb8; table[MESA_FORMAT_SIGNED_A8] = _mesa_texstore_snorm8; table[MESA_FORMAT_SIGNED_L8] = _mesa_texstore_snorm8; table[MESA_FORMAT_SIGNED_AL88] = _mesa_texstore_snorm88; @@ -4308,8 +4200,6 @@ table[MESA_FORMAT_SIGNED_L16] = _mesa_texstore_snorm16; table[MESA_FORMAT_SIGNED_AL1616] = _mesa_texstore_snorm1616; table[MESA_FORMAT_SIGNED_I16] = _mesa_texstore_snorm16; - table[MESA_FORMAT_RGB9_E5_FLOAT] = _mesa_texstore_rgb9_e5; - table[MESA_FORMAT_R11_G11_B10_FLOAT] = _mesa_texstore_r11_g11_b10f; table[MESA_FORMAT_Z32_FLOAT] = _mesa_texstore_z32; table[MESA_FORMAT_Z32_FLOAT_X24S8] = _mesa_texstore_z32f_x24s8; Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_r11g11b10f.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_r11g11b10f.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_r11g11b10f.h (removed) @@ -1,232 +0,0 @@ -/* - * Copyright (C) 2011 Marek OlÅ¡Ã¡k <maraeo(a)gmail.com> - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -/* Based on code from The OpenGL Programming Guide / 7th Edition, Appendix J. - * Available here: http://www.opengl-redbook.com/appendices/ - * The algorithm in the book contains a bug though, which is fixed in the code - * below. - */ - -#define UF11(e, m) ((e << 6) | (m)) -#define UF11_EXPONENT_BIAS 15 -#define UF11_EXPONENT_BITS 0x1F -#define UF11_EXPONENT_SHIFT 6 -#define UF11_MANTISSA_BITS 0x3F -#define UF11_MANTISSA_SHIFT (23 - UF11_EXPONENT_SHIFT) -#define UF11_MAX_EXPONENT (UF11_EXPONENT_BITS << UF11_EXPONENT_SHIFT) - -#define UF10(e, m) ((e << 5) | (m)) -#define UF10_EXPONENT_BIAS 15 -#define UF10_EXPONENT_BITS 0x1F -#define UF10_EXPONENT_SHIFT 5 -#define UF10_MANTISSA_BITS 0x1F -#define UF10_MANTISSA_SHIFT (23 - UF10_EXPONENT_SHIFT) -#define UF10_MAX_EXPONENT (UF10_EXPONENT_BITS << UF10_EXPONENT_SHIFT) - -#define F32_INFINITY 0x7f800000 - -static INLINE unsigned f32_to_uf11(float val) -{ - union { - float f; - uint32_t ui; - } f32 = {val}; - - uint16_t uf11 = 0; - - /* Decode little-endian 32-bit floating-point value */ - int sign = (f32.ui >> 16) & 0x8000; - /* Map exponent to the range [-127,128] */ - int exponent = ((f32.ui >> 23) & 0xff) - 127; - int mantissa = f32.ui & 0x007fffff; - - if (exponent == 128) { /* Infinity or NaN */ - /* From the GL_EXT_packed_float spec: - * - * "Additionally: negative infinity is converted to zero; positive - * infinity is converted to positive infinity; and both positive and - * negative NaN are converted to positive NaN." - */ - uf11 = UF11_MAX_EXPONENT; - if (mantissa) { - uf11 |= 1; /* NaN */ - } else { - if (sign) - uf11 = 0; /* 0.0 */ - } - } else if (sign) { - return 0; - } else if (val > 65024.0f) { - /* From the GL_EXT_packed_float spec: - * - * "Likewise, finite positive values greater than 65024 (the maximum - * finite representable unsigned 11-bit floating-point value) are - * converted to 65024." - */ - uf11 = UF11(30, 63); - } - else if (exponent > -15) { /* Representable value */ - exponent += UF11_EXPONENT_BIAS; - mantissa >>= UF11_MANTISSA_SHIFT; - uf11 = exponent << UF11_EXPONENT_SHIFT | mantissa; - } - - return uf11; -} - -static INLINE float uf11_to_f32(uint16_t val) -{ - union { - float f; - uint32_t ui; - } f32; - - int exponent = (val & 0x07c0) >> UF11_EXPONENT_SHIFT; - int mantissa = (val & 0x003f); - - f32.f = 0.0; - - if (exponent == 0) { - if (mantissa != 0) { - const float scale = 1.0 / (1 << 20); - f32.f = scale * mantissa; - } - } - else if (exponent == 31) { - f32.ui = F32_INFINITY | mantissa; - } - else { - float scale, decimal; - exponent -= 15; - if (exponent < 0) { - scale = 1.0f / (1 << -exponent); - } - else { - scale = (float) (1 << exponent); - } - decimal = 1.0f + (float) mantissa / 64; - f32.f = scale * decimal; - } - - return f32.f; -} - -static INLINE unsigned f32_to_uf10(float val) -{ - union { - float f; - uint32_t ui; - } f32 = {val}; - - uint16_t uf10 = 0; - - /* Decode little-endian 32-bit floating-point value */ - int sign = (f32.ui >> 16) & 0x8000; - /* Map exponent to the range [-127,128] */ - int exponent = ((f32.ui >> 23) & 0xff) - 127; - int mantissa = f32.ui & 0x007fffff; - - if (exponent == 128) { - /* From the GL_EXT_packed_float spec: - * - * "Additionally: negative infinity is converted to zero; positive - * infinity is converted to positive infinity; and both positive and - * negative NaN are converted to positive NaN." - */ - uf10 = UF10_MAX_EXPONENT; - if (mantissa) { - uf10 |= 1; /* NaN */ - } else { - if (sign) - uf10 = 0; /* 0.0 */ - } - } else if (sign) { - return 0; - } else if (val > 64512.0f) { /* Overflow - flush to Infinity */ - /* From the GL_EXT_packed_float spec: - * - * "Likewise, finite positive values greater than 64512 (the maximum - * finite representable unsigned 10-bit floating-point value) are - * converted to 64512." - */ - uf10 = UF10(30, 31); - } - else if (exponent > -15) { /* Representable value */ - exponent += UF10_EXPONENT_BIAS; - mantissa >>= UF10_MANTISSA_SHIFT; - uf10 = exponent << UF10_EXPONENT_SHIFT | mantissa; - } - - return uf10; -} - -static INLINE float uf10_to_f32(uint16_t val) -{ - union { - float f; - uint32_t ui; - } f32; - - int exponent = (val & 0x03e0) >> UF10_EXPONENT_SHIFT; - int mantissa = (val & 0x001f); - - f32.f = 0.0; - - if (exponent == 0) { - if (mantissa != 0) { - const float scale = 1.0 / (1 << 20); - f32.f = scale * mantissa; - } - } - else if (exponent == 31) { - f32.ui = F32_INFINITY | mantissa; - } - else { - float scale, decimal; - exponent -= 15; - if (exponent < 0) { - scale = 1.0 / (1 << -exponent); - } - else { - scale = (float) (1 << exponent); - } - decimal = 1.0f + (float) mantissa / 32; - f32.f = scale * decimal; - } - - return f32.f; -} - -static INLINE unsigned float3_to_r11g11b10f(const float rgb[3]) -{ - return ( f32_to_uf11(rgb[0]) & 0x7ff) | - ((f32_to_uf11(rgb[1]) & 0x7ff) << 11) | - ((f32_to_uf10(rgb[2]) & 0x3ff) << 22); -} - -static INLINE void r11g11b10f_to_float3(unsigned rgb, float retval[3]) -{ - retval[0] = uf11_to_f32( rgb & 0x7ff); - retval[1] = uf11_to_f32((rgb >> 11) & 0x7ff); - retval[2] = uf10_to_f32((rgb >> 22) & 0x3ff); -} Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_rgb9e5.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_rgb9e5.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/u_format_rgb9e5.h (removed) @@ -1,164 +0,0 @@ -/* - * Copyright (C) 2011 Marek OlÅ¡Ã¡k <maraeo(a)gmail.com> - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -/* Copied from EXT_texture_shared_exponent and edited. */ - -#ifndef RGB9E5_H -#define RGB9E5_H - -#include <math.h> -#include <assert.h> - -#define RGB9E5_EXPONENT_BITS 5 -#define RGB9E5_MANTISSA_BITS 9 -#define RGB9E5_EXP_BIAS 15 -#define RGB9E5_MAX_VALID_BIASED_EXP 31 - -#define MAX_RGB9E5_EXP (RGB9E5_MAX_VALID_BIASED_EXP - RGB9E5_EXP_BIAS) -#define RGB9E5_MANTISSA_VALUES (1<<RGB9E5_MANTISSA_BITS) -#define MAX_RGB9E5_MANTISSA (RGB9E5_MANTISSA_VALUES-1) -#define MAX_RGB9E5 (((float)MAX_RGB9E5_MANTISSA)/RGB9E5_MANTISSA_VALUES * (1<<MAX_RGB9E5_EXP)) -#define EPSILON_RGB9E5 ((1.0/RGB9E5_MANTISSA_VALUES) / (1<<RGB9E5_EXP_BIAS)) - -typedef union { - unsigned int raw; - float value; - struct { -#if defined(MESA_BIG_ENDIAN) || defined(PIPE_ARCH_BIG_ENDIAN) - unsigned int negative:1; - unsigned int biasedexponent:8; - unsigned int mantissa:23; -#else - unsigned int mantissa:23; - unsigned int biasedexponent:8; - unsigned int negative:1; -#endif - } field; -} float754; - -typedef union { - unsigned int raw; - struct { -#if defined(MESA_BIG_ENDIAN) || defined(PIPE_ARCH_BIG_ENDIAN) - unsigned int biasedexponent:RGB9E5_EXPONENT_BITS; - unsigned int b:RGB9E5_MANTISSA_BITS; - unsigned int g:RGB9E5_MANTISSA_BITS; - unsigned int r:RGB9E5_MANTISSA_BITS; -#else - unsigned int r:RGB9E5_MANTISSA_BITS; - unsigned int g:RGB9E5_MANTISSA_BITS; - unsigned int b:RGB9E5_MANTISSA_BITS; - unsigned int biasedexponent:RGB9E5_EXPONENT_BITS; -#endif - } field; -} rgb9e5; - -static INLINE float rgb9e5_ClampRange(float x) -{ - if (x > 0.0) { - if (x >= MAX_RGB9E5) { - return MAX_RGB9E5; - } else { - return x; - } - } else { - /* NaN gets here too since comparisons with NaN always fail! */ - return 0.0; - } -} - -/* Ok, FloorLog2 is not correct for the denorm and zero values, but we - are going to do a max of this value with the minimum rgb9e5 exponent - that will hide these problem cases. */ -static INLINE int rgb9e5_FloorLog2(float x) -{ - float754 f; - - f.value = x; - return (f.field.biasedexponent - 127); -} - -static INLINE unsigned float3_to_rgb9e5(const float rgb[3]) -{ - rgb9e5 retval; - float maxrgb; - int rm, gm, bm; - float rc, gc, bc; - int exp_shared, maxm; - double denom; - - rc = rgb9e5_ClampRange(rgb[0]); - gc = rgb9e5_ClampRange(rgb[1]); - bc = rgb9e5_ClampRange(rgb[2]); - - maxrgb = MAX3(rc, gc, bc); - exp_shared = MAX2(-RGB9E5_EXP_BIAS-1, rgb9e5_FloorLog2(maxrgb)) + 1 + RGB9E5_EXP_BIAS; - assert(exp_shared <= RGB9E5_MAX_VALID_BIASED_EXP); - assert(exp_shared >= 0); - /* This pow function could be replaced by a table. */ - denom = pow(2, exp_shared - RGB9E5_EXP_BIAS - RGB9E5_MANTISSA_BITS); - - maxm = (int) floor(maxrgb / denom + 0.5); - if (maxm == MAX_RGB9E5_MANTISSA+1) { - denom *= 2; - exp_shared += 1; - assert(exp_shared <= RGB9E5_MAX_VALID_BIASED_EXP); - } else { - assert(maxm <= MAX_RGB9E5_MANTISSA); - } - - rm = (int) floor(rc / denom + 0.5); - gm = (int) floor(gc / denom + 0.5); - bm = (int) floor(bc / denom + 0.5); - - assert(rm <= MAX_RGB9E5_MANTISSA); - assert(gm <= MAX_RGB9E5_MANTISSA); - assert(bm <= MAX_RGB9E5_MANTISSA); - assert(rm >= 0); - assert(gm >= 0); - assert(bm >= 0); - - retval.field.r = rm; - retval.field.g = gm; - retval.field.b = bm; - retval.field.biasedexponent = exp_shared; - - return retval.raw; -} - -static INLINE void rgb9e5_to_float3(unsigned rgb, float retval[3]) -{ - rgb9e5 v; - int exponent; - float scale; - - v.raw = rgb; - exponent = v.field.biasedexponent - RGB9E5_EXP_BIAS - RGB9E5_MANTISSA_BITS; - scale = (float) pow(2, exponent); - - retval[0] = v.field.r * scale; - retval[1] = v.field.g * scale; - retval[2] = v.field.b * scale; -} - -#endif 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 13:27:57 2013 @@ -139,9 +139,7 @@ ctx->Extensions.EXT_draw_buffers2 && ctx->Extensions.ARB_framebuffer_object && ctx->Extensions.EXT_framebuffer_sRGB && - ctx->Extensions.EXT_packed_float && ctx->Extensions.EXT_texture_array && - ctx->Extensions.EXT_texture_shared_exponent && ctx->Extensions.EXT_transform_feedback && ctx->Extensions.NV_conditional_render); const GLboolean ver_3_1 = (ver_3_0 && Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -39,17 +39,9 @@ #include "main/texcompress_fxt1.h" #include "main/texcompress_s3tc.h" #include "main/texcompress_rgtc.h" -#include "main/texcompress_etc.h" #include "main/teximage.h" #include "s_context.h" #include "s_texfetch.h" -#if 0 -#include "../../gallium/auxiliary/util/u_format_rgb9e5.h" -#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h" -#else -#include "../main/u_format_rgb9e5.h" -#include "../main/u_format_r11g11b10f.h" -#endif /** @@ -1027,12 +1019,6 @@ NULL }, { - MESA_FORMAT_ETC1_RGB8, - NULL, - _mesa_fetch_texel_2d_f_etc1_rgb8, - NULL - }, - { MESA_FORMAT_SIGNED_A8, fetch_texel_1d_signed_a8, fetch_texel_2d_signed_a8, @@ -1079,18 +1065,6 @@ fetch_texel_1d_signed_i16, fetch_texel_2d_signed_i16, fetch_texel_3d_signed_i16 - }, - { - MESA_FORMAT_RGB9_E5_FLOAT, - fetch_texel_1d_rgb9_e5, - fetch_texel_2d_rgb9_e5, - fetch_texel_3d_rgb9_e5 - }, - { - MESA_FORMAT_R11_G11_B10_FLOAT, - fetch_texel_1d_r11_g11_b10f, - fetch_texel_2d_r11_g11_b10f, - fetch_texel_3d_r11_g11_b10f }, { MESA_FORMAT_Z32_FLOAT, Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch_tmp.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch_tmp.h [iso-8859-1] Tue Oct 1 13:27:57 2013 @@ -1525,34 +1525,6 @@ } - - -/* MESA_FORMAT_RGB9_E5 ******************************************************/ - -static void FETCH(rgb9_e5)( const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1); - rgb9e5_to_float3(*src, texel); - texel[ACOMP] = 1.0F; -} - - - - -/* MESA_FORMAT_R11_G11_B10_FLOAT *********************************************/ - -static void FETCH(r11_g11_b10f)( const struct swrast_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1); - r11g11b10f_to_float3(*src, texel); - texel[ACOMP] = 1.0F; -} - - - - /* MESA_FORMAT_Z32_FLOAT_X24S8 ***********************************************/ static void FETCH(z32f_x24s8)(const struct swrast_texture_image *texImage,

10 years, 11 months

[aandrejevic] 60487: [SOFT386] Halfplement group 0xFF (Only INC/DEC).

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Oct 1 01:31:36 2013 New Revision: 60487 URL: http://svn.reactos.org/svn/reactos?rev=60487&view=rev Log: [SOFT386] Halfplement group 0xFF (Only INC/DEC). Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Tue Oct 1 01:31:36 2013 @@ -1058,8 +1058,121 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupFF) { - UNIMPLEMENTED; - return FALSE; // TODO: NOT IMPLEMENTED + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (ModRegRm.Register == 7) + { + /* Invalid */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Read the operands */ + if (OperandSize) + { + ULONG Dummy, Value; + + if (!Soft386ReadModrmDwordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + if (ModRegRm.Register == 0) + { + /* Increment and update OF */ + Value++; + State->Flags.Of = (Value == SIGN_FLAG_LONG) ? TRUE : FALSE; + } + else if (ModRegRm.Register == 1) + { + /* Decrement and update OF */ + State->Flags.Of = (Value == SIGN_FLAG_LONG) ? TRUE : FALSE; + Value--; + } + + if (ModRegRm.Register <= 1) + { + /* Update flags */ + State->Flags.Sf = (Value & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Zf = (Value == 0) ? TRUE : FALSE; + State->Flags.Af = ((Value & 0x0F) == 0) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Value); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + FALSE, + Value); + } + } + else + { + USHORT Dummy, Value; + + if (!Soft386ReadModrmWordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + if (ModRegRm.Register == 0) + { + /* Increment and update OF */ + Value++; + State->Flags.Of = (Value == SIGN_FLAG_WORD) ? TRUE : FALSE; + } + else if (ModRegRm.Register == 1) + { + /* Decrement and update OF */ + State->Flags.Of = (Value == SIGN_FLAG_WORD) ? TRUE : FALSE; + Value--; + } + + if (ModRegRm.Register <= 1) + { + /* Update flags */ + State->Flags.Sf = (Value & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Zf = (Value == 0) ? TRUE : FALSE; + State->Flags.Af = ((Value & 0x0F) == 0) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Value); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + Value); + } + } + + if (ModRegRm.Register > 1) + { + UNIMPLEMENTED; + return FALSE; // NOT IMPLEMENTED + } + + return TRUE; } /* EOF */

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2013