AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Remove NV_vertex_program-specific parameters support.

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Eric Anholt
2012-10-09 16:18:35 -07:00
parent c0120c2509
commit 363643f540
4 changed files with 0 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/api_exec.c
-4
View File
@@ -480,8 +480,6 @@ _mesa_create_exec_table(struct gl_context *ctx)
SET_GenProgramsNV(exec, _mesa_GenPrograms);
SET_AreProgramsResidentNV(exec, _mesa_AreProgramsResidentNV);
SET_RequestResidentProgramsNV(exec, _mesa_RequestResidentProgramsNV);
SET_GetProgramParameterfvNV(exec, _mesa_GetProgramParameterfvNV);
SET_GetProgramParameterdvNV(exec, _mesa_GetProgramParameterdvNV);
SET_GetProgramivNV(exec, _mesa_GetProgramivNV);
SET_GetProgramStringNV(exec, _mesa_GetProgramStringNV);
SET_GetVertexAttribdvNV(exec, _mesa_GetVertexAttribdvNV);
@@ -493,8 +491,6 @@ _mesa_create_exec_table(struct gl_context *ctx)
SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB); /* alias to ProgramParameter4dvNV */
SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB); /* alias to ProgramParameter4fNV */
SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB); /* alias to ProgramParameter4fvNV */
SET_ProgramParameters4dvNV(exec, _mesa_ProgramParameters4dvNV);
SET_ProgramParameters4fvNV(exec, _mesa_ProgramParameters4fvNV);
SET_VertexAttribPointerNV(exec, _mesa_VertexAttribPointerNV);
/* glVertexAttrib*NV functions handled in api_loopback.c */
}
src/mesa/main/dlist.c
-26
View File
@@ -4962,28 +4962,6 @@ save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)
}
static void GLAPIENTRY
save_ProgramParameters4dvNV(GLenum target, GLuint index,
GLsizei num, const GLdouble *params)
{
GLint i;
for (i = 0; i < num; i++) {
save_ProgramEnvParameter4dvARB(target, index + i, params + 4 * i);
}
}
static void GLAPIENTRY
save_ProgramParameters4fvNV(GLenum target, GLuint index,
GLsizei num, const GLfloat *params)
{
GLint i;
for (i = 0; i < num; i++) {
save_ProgramEnvParameter4fvARB(target, index + i, params + 4 * i);
}
}
static void GLAPIENTRY
save_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
const GLubyte * program)
@@ -10217,8 +10195,6 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_GenProgramsNV(table, _mesa_GenPrograms);
SET_AreProgramsResidentNV(table, _mesa_AreProgramsResidentNV);
SET_RequestResidentProgramsNV(table, save_RequestResidentProgramsNV);
SET_GetProgramParameterfvNV(table, _mesa_GetProgramParameterfvNV);
SET_GetProgramParameterdvNV(table, _mesa_GetProgramParameterdvNV);
SET_GetProgramivNV(table, _mesa_GetProgramivNV);
SET_GetProgramStringNV(table, _mesa_GetProgramStringNV);
SET_GetVertexAttribdvNV(table, _mesa_GetVertexAttribdvNV);
@@ -10231,8 +10207,6 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB);
SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB);
SET_ProgramEnvParameter4fvARB(table, save_ProgramEnvParameter4fvARB);
SET_ProgramParameters4dvNV(table, save_ProgramParameters4dvNV);
SET_ProgramParameters4fvNV(table, save_ProgramParameters4fvNV);
SET_VertexAttribPointerNV(table, _mesa_VertexAttribPointerNV);
/* 244. GL_ATI_envmap_bumpmap */
src/mesa/main/nvprogram.c
-133
View File
@@ -165,77 +165,6 @@ _mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids)
}
}
/**
* Get a program parameter register.
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void GLAPIENTRY
_mesa_GetProgramParameterfvNV(GLenum target, GLuint index,
GLenum pname, GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (target == GL_VERTEX_PROGRAM_NV) {
if (pname == GL_PROGRAM_PARAMETER_NV) {
if (index < MAX_NV_VERTEX_PROGRAM_PARAMS) {
COPY_4V(params, ctx->VertexProgram.Parameters[index]);
}
else {
_mesa_error(ctx, GL_INVALID_VALUE,
"glGetProgramParameterfvNV(index)");
return;
}
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterfvNV(pname)");
return;
}
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterfvNV(target)");
return;
}
}
/**
* Get a program parameter register.
* \note Not compiled into display lists.
* \note Called from the GL API dispatcher.
*/
void GLAPIENTRY
_mesa_GetProgramParameterdvNV(GLenum target, GLuint index,
GLenum pname, GLdouble *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (target == GL_VERTEX_PROGRAM_NV) {
if (pname == GL_PROGRAM_PARAMETER_NV) {
if (index < MAX_NV_VERTEX_PROGRAM_PARAMS) {
COPY_4V(params, ctx->VertexProgram.Parameters[index]);
}
else {
_mesa_error(ctx, GL_INVALID_VALUE,
"glGetProgramParameterdvNV(index)");
return;
}
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterdvNV(pname)");
return;
}
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterdvNV(target)");
return;
}
}
/**
* Get a program attribute.
* \note Not compiled into display lists.
@@ -612,68 +541,6 @@ _mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
}
/**
* Set a sequence of program parameter registers.
* \note Called from the GL API dispatcher.
*/
void GLAPIENTRY
_mesa_ProgramParameters4dvNV(GLenum target, GLuint index,
GLsizei num, const GLdouble *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {
GLint i;
if (index + num > MAX_NV_VERTEX_PROGRAM_PARAMS) {
_mesa_error(ctx, GL_INVALID_VALUE, "glProgramParameters4dvNV");
return;
}
for (i = 0; i < num; i++) {
ctx->VertexProgram.Parameters[index + i][0] = (GLfloat) params[0];
ctx->VertexProgram.Parameters[index + i][1] = (GLfloat) params[1];
ctx->VertexProgram.Parameters[index + i][2] = (GLfloat) params[2];
ctx->VertexProgram.Parameters[index + i][3] = (GLfloat) params[3];
params += 4;
};
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameters4dvNV");
return;
}
}
/**
* Set a sequence of program parameter registers.
* \note Called from the GL API dispatcher.
*/
void GLAPIENTRY
_mesa_ProgramParameters4fvNV(GLenum target, GLuint index,
GLsizei num, const GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {
GLint i;
if (index + num > MAX_NV_VERTEX_PROGRAM_PARAMS) {
_mesa_error(ctx, GL_INVALID_VALUE, "glProgramParameters4fvNV");
return;
}
for (i = 0; i < num; i++) {
COPY_4V(ctx->VertexProgram.Parameters[index + i], params);
params += 4;
}
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameters4fvNV");
return;
}
}
void GLAPIENTRY
_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
GLfloat x, GLfloat y, GLfloat z, GLfloat w)
src/mesa/main/nvprogram.h
-14
View File
@@ -43,12 +43,6 @@ _mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids, GLboolean *residences)
extern void GLAPIENTRY
_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids);
extern void GLAPIENTRY
_mesa_GetProgramParameterfvNV(GLenum target, GLuint index, GLenum pname, GLfloat *params);
extern void GLAPIENTRY
_mesa_GetProgramParameterdvNV(GLenum target, GLuint index, GLenum pname, GLdouble *params);
extern void GLAPIENTRY
_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params);
@@ -70,14 +64,6 @@ _mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer);
extern void GLAPIENTRY
_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte *program);
extern void GLAPIENTRY
_mesa_ProgramParameters4dvNV(GLenum target, GLuint index, GLsizei num,
const GLdouble *params);
extern void GLAPIENTRY
_mesa_ProgramParameters4fvNV(GLenum target, GLuint index, GLsizei num,
const GLfloat *params);
extern void GLAPIENTRY
_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
GLfloat x, GLfloat y, GLfloat z, GLfloat w);