Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MESA/OPENGL32]

Browse source 
- Disable un-used mesa features (ATI/NV programs) for a leaner build
 - Print a fixme instead of asserting in software version of wglGetProcAddress

svn path=/trunk/; revision=60300
This commit is contained in:
Jérôme Gardou 2013-09-22 00:25:59 +00:00
parent 8ffc368a0c
commit ccafea6eee
6 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt
View file

@ -8,7 +8,7 @@ list(APPEND SOURCE
api_validate.c
accum.c
arbprogram.c
atifragshader.c
# atifragshader.c
attrib.c
arrayobj.c
blend.c
@ -54,7 +54,7 @@ list(APPEND SOURCE
mipmap.c
mm.c
multisample.c
nvprogram.c
# nvprogram.c
pack.c
pbo.c
pixel.c

4
reactos/dll/opengl/mesa/src/mesa/main/arbprogram.c
View file

@ -370,6 +370,7 @@ _mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
base = & prog->Base;
}
#if FEATURE_NV_vertex_program
else if ((target == GL_VERTEX_PROGRAM_ARB
|| target == GL_VERTEX_STATE_PROGRAM_NV)
&& ctx->Extensions.NV_vertex_program) {
@ -378,6 +379,7 @@ _mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
base = & prog->Base;
}
#endif
else if (target == GL_FRAGMENT_PROGRAM_ARB
&& ctx->Extensions.ARB_fragment_program) {
struct gl_fragment_program *prog = ctx->FragmentProgram.Current;
@ -385,6 +387,7 @@ _mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
base = & prog->Base;
}
#if FEATURE_NV_fragment_program
else if (target == GL_FRAGMENT_PROGRAM_NV
&& ctx->Extensions.NV_fragment_program) {
struct gl_fragment_program *prog = ctx->FragmentProgram.Current;
@ -392,6 +395,7 @@ _mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
base = & prog->Base;
}
#endif
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(target)");
return;

8
reactos/dll/opengl/mesa/src/mesa/main/dlist.c
View file

@ -5027,7 +5027,7 @@ save_TrackMatrixNV(GLenum target, GLuint address,
/*
* GL_NV_fragment_program
*/
#if FEATURE_NV_fragment_program
#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
static void GLAPIENTRY
save_ProgramLocalParameter4fARB(GLenum target, GLuint index,
GLfloat x, GLfloat y, GLfloat z, GLfloat w)
@ -5148,6 +5148,7 @@ save_ProgramLocalParameter4dvARB(GLenum target, GLuint index,
}
}
#if FEATURE_NV_fragment_program
static void GLAPIENTRY
save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte * name,
GLfloat x, GLfloat y, GLfloat z, GLfloat w)
@ -5178,7 +5179,6 @@ save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte * name,
}
}
static void GLAPIENTRY
save_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte * name,
const float v[])
@ -5204,7 +5204,7 @@ save_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte * name,
(GLfloat) v[1], (GLfloat) v[2],
(GLfloat) v[3]);
}
#endif
#endif /* FEATURE_NV_fragment_program */
@ -10218,7 +10218,9 @@ _mesa_create_save_table(void)
SET_GetVertexAttribdvARB(table, _mesa_GetVertexAttribdvARB);
SET_GetVertexAttribfvARB(table, _mesa_GetVertexAttribfvARB);
SET_GetVertexAttribivARB(table, _mesa_GetVertexAttribivARB);
#if FEATURE_NV_vertex_program
SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervNV);
#endif
SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB);
SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB);
SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB);

6
reactos/dll/opengl/mesa/src/mesa/main/mfeatures.h
View file

@ -132,10 +132,10 @@
#define FEATURE_EXT_transform_feedback FEATURE_GL
#define FEATURE_APPLE_object_purgeable FEATURE_GL
#define FEATURE_ATI_fragment_shader FEATURE_GL
#define FEATURE_ATI_fragment_shader 0
#define FEATURE_NV_fence FEATURE_GL
#define FEATURE_NV_fragment_program FEATURE_GL
#define FEATURE_NV_vertex_program FEATURE_GL
#define FEATURE_NV_fragment_program 0
#define FEATURE_NV_vertex_program 0
#define FEATURE_OES_EGL_image 1
#define FEATURE_OES_draw_texture FEATURE_ES1

4
reactos/dll/opengl/mesa/src/mesa/program/CMakeLists.txt
View file

@ -5,8 +5,8 @@ list(APPEND SOURCE
arbprogparse.c
hash_table.c
ir_to_mesa.cpp
nvfragparse.c
nvvertparse.c
# nvfragparse.c
# nvvertparse.c
program.c
program_parse_extra.c
prog_cache.c

6
reactos/dll/opengl/opengl32/swimpl.c
View file

@ -103,7 +103,9 @@ sw_get_string( struct gl_context *ctx, GLenum name )
(void) ctx;
if(name == GL_RENDERER)
return (const GLubyte *) "ReactOS Software Implementation";
/* Don't claim to support the fancy extensions that mesa supports, they will be slow anyway */
if(name == GL_EXTENSIONS)
return (const GLubyte *)"";
return NULL;
}
@ -593,7 +595,7 @@ BOOL sw_DeleteContext(DHGLRC dhglrc)
PROC sw_GetProcAddress(LPCSTR name)
{
/* We don't support any extensions */
assert(FALSE);
FIXME("Asking for proc address %s, returning NULL.\n", name);
return NULL;
}