OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove FEATURE_ATI_fragment_shader define.

Browse Source 
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Oliver McFadden
2012-09-11 11:15:14 +03:00
parent dd44f80f81
commit 961fcc45ad
8 changed files with 2 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/atifragshader.c
View File

@@ -32,8 +32,6 @@
#include "main/dispatch.h" #include "main/dispatch.h"
#include "main/atifragshader.h" #include "main/atifragshader.h"
#if FEATURE_ATI_fragment_shader
#define MESA_DEBUG_ATI_FS 0 #define MESA_DEBUG_ATI_FS 0
static struct ati_fragment_shader DummyShader; static struct ati_fragment_shader DummyShader;
@@ -786,5 +784,3 @@ _mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value)
COPY_4V(ctx->ATIFragmentShader.GlobalConstants[dstindex], value); COPY_4V(ctx->ATIFragmentShader.GlobalConstants[dstindex], value);
} }
} }
#endif /* FEATURE_ATI_fragment_shader */

22
src/mesa/main/atifragshader.h
View File

@@ -63,8 +63,6 @@ struct atifs_setupinst
}; };
#if FEATURE_ATI_fragment_shader
extern void extern void
_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp); _mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp);
@@ -128,25 +126,5 @@ _mesa_AlphaFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value); _mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value);
#else /* FEATURE_ATI_fragment_shader */
static inline void
_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
{
}
static inline struct ati_fragment_shader *
_mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id)
{
return NULL;
}
static inline void
_mesa_delete_ati_fragment_shader(struct gl_context *ctx,
struct ati_fragment_shader *s)
{
}
#endif /* FEATURE_ATI_fragment_shader */
#endif /* ATIFRAGSHADER_H */ #endif /* ATIFRAGSHADER_H */

8
src/mesa/main/dlist.c
View File

@@ -35,9 +35,7 @@
#include "api_exec.h" #include "api_exec.h"
#include "api_loopback.h" #include "api_loopback.h"
#include "api_validate.h" #include "api_validate.h"
#if FEATURE_ATI_fragment_shader
#include "atifragshader.h" #include "atifragshader.h"
#endif
#include "config.h" #include "config.h"
#include "mfeatures.h" #include "mfeatures.h"
#include "bufferobj.h" #include "bufferobj.h"
@@ -5437,7 +5435,6 @@ save_TexBumpParameterivATI(GLenum pname, const GLint *param)
save_TexBumpParameterfvATI(pname, p); save_TexBumpParameterfvATI(pname, p);
} }
#if FEATURE_ATI_fragment_shader
static void GLAPIENTRY static void GLAPIENTRY
save_BindFragmentShaderATI(GLuint id) save_BindFragmentShaderATI(GLuint id)
{ {
@@ -5471,7 +5468,6 @@ save_SetFragmentShaderConstantATI(GLuint dst, const GLfloat *value)
CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, value)); CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, value));
} }
} }
#endif
static void GLAPIENTRY static void GLAPIENTRY
save_Attr1fNV(GLenum attr, GLfloat x) save_Attr1fNV(GLenum attr, GLfloat x)
@@ -8592,7 +8588,6 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_TexBumpParameterfvATI(ctx->Exec, (pname, values)); CALL_TexBumpParameterfvATI(ctx->Exec, (pname, values));
} }
break; break;
#if FEATURE_ATI_fragment_shader
case OPCODE_BIND_FRAGMENT_SHADER_ATI: case OPCODE_BIND_FRAGMENT_SHADER_ATI:
CALL_BindFragmentShaderATI(ctx->Exec, (n[1].i)); CALL_BindFragmentShaderATI(ctx->Exec, (n[1].i));
break; break;
@@ -8606,7 +8601,6 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, values)); CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, values));
} }
break; break;
#endif
case OPCODE_ATTR_1F_NV: case OPCODE_ATTR_1F_NV:
CALL_VertexAttrib1fNV(ctx->Exec, (n[1].e, n[2].f)); CALL_VertexAttrib1fNV(ctx->Exec, (n[1].e, n[2].f));
break; break;
@@ -10273,10 +10267,8 @@ _mesa_create_save_table(void)
SET_TexBumpParameterfvATI(table, save_TexBumpParameterfvATI); SET_TexBumpParameterfvATI(table, save_TexBumpParameterfvATI);
/* 245. GL_ATI_fragment_shader */ /* 245. GL_ATI_fragment_shader */
#if FEATURE_ATI_fragment_shader
SET_BindFragmentShaderATI(table, save_BindFragmentShaderATI); SET_BindFragmentShaderATI(table, save_BindFragmentShaderATI);
SET_SetFragmentShaderConstantATI(table, save_SetFragmentShaderConstantATI); SET_SetFragmentShaderConstantATI(table, save_SetFragmentShaderConstantATI);
#endif
/* 282. GL_NV_fragment_program */ /* 282. GL_NV_fragment_program */
SET_ProgramNamedParameter4fNV(table, save_ProgramNamedParameter4fNV); SET_ProgramNamedParameter4fNV(table, save_ProgramNamedParameter4fNV);

4
src/mesa/main/enable.c
View File

@@ -980,7 +980,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
ctx->Transform.DepthClamp = state; ctx->Transform.DepthClamp = state;
break; break;
#if FEATURE_ATI_fragment_shader
case GL_FRAGMENT_SHADER_ATI: case GL_FRAGMENT_SHADER_ATI:
if (ctx->API != API_OPENGL) if (ctx->API != API_OPENGL)
goto invalid_enum_error; goto invalid_enum_error;
@@ -990,7 +989,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
FLUSH_VERTICES(ctx, _NEW_PROGRAM); FLUSH_VERTICES(ctx, _NEW_PROGRAM);
ctx->ATIFragmentShader.Enabled = state; ctx->ATIFragmentShader.Enabled = state;
break; break;
#endif
/* GL_MESA_texture_array */ /* GL_MESA_texture_array */
case GL_TEXTURE_1D_ARRAY_EXT: case GL_TEXTURE_1D_ARRAY_EXT:
@@ -1667,13 +1665,11 @@ _mesa_IsEnabled( GLenum cap )
CHECK_EXTENSION(ARB_depth_clamp); CHECK_EXTENSION(ARB_depth_clamp);
return ctx->Transform.DepthClamp; return ctx->Transform.DepthClamp;
#if FEATURE_ATI_fragment_shader
case GL_FRAGMENT_SHADER_ATI: case GL_FRAGMENT_SHADER_ATI:
if (ctx->API != API_OPENGL) if (ctx->API != API_OPENGL)
goto invalid_enum_error; goto invalid_enum_error;
CHECK_EXTENSION(ATI_fragment_shader); CHECK_EXTENSION(ATI_fragment_shader);
return ctx->ATIFragmentShader.Enabled; return ctx->ATIFragmentShader.Enabled;
#endif /* FEATURE_ATI_fragment_shader */
case GL_TEXTURE_CUBE_MAP_SEAMLESS: case GL_TEXTURE_CUBE_MAP_SEAMLESS:
if (!_mesa_is_desktop_gl(ctx)) if (!_mesa_is_desktop_gl(ctx))

2
src/mesa/main/extensions.c
View File

@@ -428,9 +428,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.ARB_sync = GL_TRUE; ctx->Extensions.ARB_sync = GL_TRUE;
ctx->Extensions.APPLE_object_purgeable = GL_TRUE; ctx->Extensions.APPLE_object_purgeable = GL_TRUE;
ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE; ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE;
#if FEATURE_ATI_fragment_shader
ctx->Extensions.ATI_fragment_shader = GL_TRUE; ctx->Extensions.ATI_fragment_shader = GL_TRUE;
#endif
ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE; ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;
ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE; ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;
ctx->Extensions.ATI_texture_mirror_once = GL_TRUE; ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;

2
src/mesa/main/mfeatures.h
View File

@@ -84,6 +84,4 @@
#define FEATURE_remap_table 0 #define FEATURE_remap_table 0
#endif #endif
#define FEATURE_ATI_fragment_shader FEATURE_GL
#endif /* FEATURES_H */ #endif /* FEATURES_H */

8
src/mesa/main/shared.c
View File

@@ -31,9 +31,7 @@
#include "mfeatures.h" #include "mfeatures.h"
#include "mtypes.h" #include "mtypes.h"
#include "hash.h" #include "hash.h"
#if FEATURE_ATI_fragment_shader
#include "atifragshader.h" #include "atifragshader.h"
#endif
#include "bufferobj.h" #include "bufferobj.h"
#include "shared.h" #include "shared.h"
#include "program/program.h" #include "program/program.h"
@@ -75,10 +73,8 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
gl_fragment_program(ctx->Driver.NewProgram(ctx, gl_fragment_program(ctx->Driver.NewProgram(ctx,
GL_FRAGMENT_PROGRAM_ARB, 0)); GL_FRAGMENT_PROGRAM_ARB, 0));
#if FEATURE_ATI_fragment_shader
shared->ATIShaders = _mesa_NewHashTable(); shared->ATIShaders = _mesa_NewHashTable();
shared->DefaultFragmentShader = _mesa_new_ati_fragment_shader(ctx, 0); shared->DefaultFragmentShader = _mesa_new_ati_fragment_shader(ctx, 0);
#endif
shared->ShaderObjects = _mesa_NewHashTable(); shared->ShaderObjects = _mesa_NewHashTable();
@@ -164,7 +160,6 @@ delete_program_cb(GLuint id, void *data, void *userData)
} }
#if FEATURE_ATI_fragment_shader
/** /**
* Callback for deleting an ATI fragment shader object. * Callback for deleting an ATI fragment shader object.
* Called by _mesa_HashDeleteAll(). * Called by _mesa_HashDeleteAll().
@@ -176,7 +171,6 @@ delete_fragshader_cb(GLuint id, void *data, void *userData)
struct gl_context *ctx = (struct gl_context *) userData; struct gl_context *ctx = (struct gl_context *) userData;
_mesa_delete_ati_fragment_shader(ctx, shader); _mesa_delete_ati_fragment_shader(ctx, shader);
} }
#endif
/** /**
@@ -316,11 +310,9 @@ free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared)
_mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL); _mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL);
_mesa_reference_fragprog(ctx, &shared->DefaultFragmentProgram, NULL); _mesa_reference_fragprog(ctx, &shared->DefaultFragmentProgram, NULL);
#if FEATURE_ATI_fragment_shader
_mesa_HashDeleteAll(shared->ATIShaders, delete_fragshader_cb, ctx); _mesa_HashDeleteAll(shared->ATIShaders, delete_fragshader_cb, ctx);
_mesa_DeleteHashTable(shared->ATIShaders); _mesa_DeleteHashTable(shared->ATIShaders);
_mesa_delete_ati_fragment_shader(ctx, shared->DefaultFragmentShader); _mesa_delete_ati_fragment_shader(ctx, shared->DefaultFragmentShader);
#endif
_mesa_HashDeleteAll(shared->BufferObjects, delete_bufferobj_cb, ctx); _mesa_HashDeleteAll(shared->BufferObjects, delete_bufferobj_cb, ctx);
_mesa_DeleteHashTable(shared->BufferObjects); _mesa_DeleteHashTable(shared->BufferObjects);

8
src/mesa/program/program.c
View File

@@ -109,12 +109,10 @@ _mesa_init_program(struct gl_context *ctx)
ctx->GeometryProgram.Cache = _mesa_new_program_cache(); ctx->GeometryProgram.Cache = _mesa_new_program_cache();
/* XXX probably move this stuff */ /* XXX probably move this stuff */
#if FEATURE_ATI_fragment_shader
ctx->ATIFragmentShader.Enabled = GL_FALSE; ctx->ATIFragmentShader.Enabled = GL_FALSE;
ctx->ATIFragmentShader.Current = ctx->Shared->DefaultFragmentShader; ctx->ATIFragmentShader.Current = ctx->Shared->DefaultFragmentShader;
assert(ctx->ATIFragmentShader.Current); assert(ctx->ATIFragmentShader.Current);
ctx->ATIFragmentShader.Current->RefCount++; ctx->ATIFragmentShader.Current->RefCount++;
#endif
} }
@@ -130,15 +128,15 @@ _mesa_free_program_data(struct gl_context *ctx)
_mesa_delete_shader_cache(ctx, ctx->FragmentProgram.Cache); _mesa_delete_shader_cache(ctx, ctx->FragmentProgram.Cache);
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL); _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);
_mesa_delete_program_cache(ctx, ctx->GeometryProgram.Cache); _mesa_delete_program_cache(ctx, ctx->GeometryProgram.Cache);
/* XXX probably move this stuff */ /* XXX probably move this stuff */
#if FEATURE_ATI_fragment_shader
if (ctx->ATIFragmentShader.Current) { if (ctx->ATIFragmentShader.Current) {
ctx->ATIFragmentShader.Current->RefCount--; ctx->ATIFragmentShader.Current->RefCount--;
if (ctx->ATIFragmentShader.Current->RefCount <= 0) { if (ctx->ATIFragmentShader.Current->RefCount <= 0) {
free(ctx->ATIFragmentShader.Current); free(ctx->ATIFragmentShader.Current);
} }
} }
#endif
free((void *) ctx->Program.ErrorString); free((void *) ctx->Program.ErrorString);
} }
@@ -163,7 +161,6 @@ _mesa_update_default_objects_program(struct gl_context *ctx)
ctx->Shared->DefaultGeometryProgram); ctx->Shared->DefaultGeometryProgram);
/* XXX probably move this stuff */ /* XXX probably move this stuff */
#if FEATURE_ATI_fragment_shader
if (ctx->ATIFragmentShader.Current) { if (ctx->ATIFragmentShader.Current) {
ctx->ATIFragmentShader.Current->RefCount--; ctx->ATIFragmentShader.Current->RefCount--;
if (ctx->ATIFragmentShader.Current->RefCount <= 0) { if (ctx->ATIFragmentShader.Current->RefCount <= 0) {
@@ -173,7 +170,6 @@ _mesa_update_default_objects_program(struct gl_context *ctx)
ctx->ATIFragmentShader.Current = (struct ati_fragment_shader *) ctx->Shared->DefaultFragmentShader; ctx->ATIFragmentShader.Current = (struct ati_fragment_shader *) ctx->Shared->DefaultFragmentShader;
assert(ctx->ATIFragmentShader.Current); assert(ctx->ATIFragmentShader.Current);
ctx->ATIFragmentShader.Current->RefCount++; ctx->ATIFragmentShader.Current->RefCount++;
#endif
} }