s/GetFragmentProgramRegister/GetProgramRegister/
This commit is contained in:
@@ -129,7 +129,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
|
|||||||
driver->NewProgram = _mesa_new_program;
|
driver->NewProgram = _mesa_new_program;
|
||||||
driver->DeleteProgram = _mesa_delete_program;
|
driver->DeleteProgram = _mesa_delete_program;
|
||||||
#if FEATURE_MESA_program_debug
|
#if FEATURE_MESA_program_debug
|
||||||
driver->GetFragmentProgramRegister = _mesa_get_program_register;
|
driver->GetProgramRegister = _mesa_get_program_register;
|
||||||
#endif /* FEATURE_MESA_program_debug */
|
#endif /* FEATURE_MESA_program_debug */
|
||||||
|
|
||||||
/* simple state commands */
|
/* simple state commands */
|
||||||
|
@@ -570,9 +570,9 @@ struct dd_function_table {
|
|||||||
/** Notify driver that a program string has been specified. */
|
/** Notify driver that a program string has been specified. */
|
||||||
void (*ProgramStringNotify)(GLcontext *ctx, GLenum target,
|
void (*ProgramStringNotify)(GLcontext *ctx, GLenum target,
|
||||||
struct gl_program *prog);
|
struct gl_program *prog);
|
||||||
/** Get value of a fragment program register during program execution. */
|
/** Get value of a program register during program execution. */
|
||||||
void (*GetFragmentProgramRegister)(GLcontext *ctx, enum register_file file,
|
void (*GetProgramRegister)(GLcontext *ctx, enum register_file file,
|
||||||
GLuint index, GLfloat val[4]);
|
GLuint index, GLfloat val[4]);
|
||||||
|
|
||||||
/** Query if program can be loaded onto hardware */
|
/** Query if program can be loaded onto hardware */
|
||||||
GLboolean (*IsProgramNative)(GLcontext *ctx, GLenum target,
|
GLboolean (*IsProgramNative)(GLcontext *ctx, GLenum target,
|
||||||
|
@@ -141,9 +141,7 @@ _mesa_GetProgramRegisterfvMESA(GLenum target,
|
|||||||
"glGetProgramRegisterfvMESA(registerName)");
|
"glGetProgramRegisterfvMESA(registerName)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#if 0 /* FIX ME */
|
ctx->Driver.GetProgramRegister(ctx, PROGRAM_TEMPORARY, i, v);
|
||||||
ctx->Driver.GetVertexProgramRegister(ctx, PROGRAM_TEMPORARY, i, v);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else if (reg[0] == 'v' && reg[1] == '[') {
|
else if (reg[0] == 'v' && reg[1] == '[') {
|
||||||
/* Vertex Input attribute */
|
/* Vertex Input attribute */
|
||||||
@@ -154,10 +152,7 @@ _mesa_GetProgramRegisterfvMESA(GLenum target,
|
|||||||
_mesa_sprintf(number, "%d", i);
|
_mesa_sprintf(number, "%d", i);
|
||||||
if (_mesa_strncmp(reg + 2, name, 4) == 0 ||
|
if (_mesa_strncmp(reg + 2, name, 4) == 0 ||
|
||||||
_mesa_strncmp(reg + 2, number, _mesa_strlen(number)) == 0) {
|
_mesa_strncmp(reg + 2, number, _mesa_strlen(number)) == 0) {
|
||||||
#if 0 /* FIX ME */
|
ctx->Driver.GetProgramRegister(ctx, PROGRAM_INPUT, i, v);
|
||||||
ctx->Driver.GetVertexProgramRegister(ctx, PROGRAM_INPUT,
|
|
||||||
i, v);
|
|
||||||
#endif
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -210,7 +205,7 @@ _mesa_GetProgramRegisterfvMESA(GLenum target,
|
|||||||
"glGetProgramRegisterfvMESA(registerName)");
|
"glGetProgramRegisterfvMESA(registerName)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ctx->Driver.GetFragmentProgramRegister(ctx, PROGRAM_TEMPORARY,
|
ctx->Driver.GetProgramRegister(ctx, PROGRAM_TEMPORARY,
|
||||||
i, v);
|
i, v);
|
||||||
}
|
}
|
||||||
else if (reg[0] == 'f' && reg[1] == '[') {
|
else if (reg[0] == 'f' && reg[1] == '[') {
|
||||||
@@ -219,8 +214,7 @@ _mesa_GetProgramRegisterfvMESA(GLenum target,
|
|||||||
for (i = 0; i < ctx->Const.FragmentProgram.MaxAttribs; i++) {
|
for (i = 0; i < ctx->Const.FragmentProgram.MaxAttribs; i++) {
|
||||||
const char *name = _mesa_nv_fragment_input_register_name(i);
|
const char *name = _mesa_nv_fragment_input_register_name(i);
|
||||||
if (_mesa_strncmp(reg + 2, name, 4) == 0) {
|
if (_mesa_strncmp(reg + 2, name, 4) == 0) {
|
||||||
ctx->Driver.GetFragmentProgramRegister(ctx,
|
ctx->Driver.GetProgramRegister(ctx, PROGRAM_INPUT, i, v);
|
||||||
PROGRAM_INPUT, i, v);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -230,18 +224,18 @@ _mesa_GetProgramRegisterfvMESA(GLenum target,
|
|||||||
}
|
}
|
||||||
else if (_mesa_strcmp(reg, "o[COLR]") == 0) {
|
else if (_mesa_strcmp(reg, "o[COLR]") == 0) {
|
||||||
/* Fragment output color */
|
/* Fragment output color */
|
||||||
ctx->Driver.GetFragmentProgramRegister(ctx, PROGRAM_OUTPUT,
|
ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
|
||||||
FRAG_RESULT_COLR, v);
|
FRAG_RESULT_COLR, v);
|
||||||
}
|
}
|
||||||
else if (_mesa_strcmp(reg, "o[COLH]") == 0) {
|
else if (_mesa_strcmp(reg, "o[COLH]") == 0) {
|
||||||
/* Fragment output color */
|
/* Fragment output color */
|
||||||
ctx->Driver.GetFragmentProgramRegister(ctx, PROGRAM_OUTPUT,
|
ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
|
||||||
FRAG_RESULT_COLH, v);
|
FRAG_RESULT_COLH, v);
|
||||||
}
|
}
|
||||||
else if (_mesa_strcmp(reg, "o[DEPR]") == 0) {
|
else if (_mesa_strcmp(reg, "o[DEPR]") == 0) {
|
||||||
/* Fragment output depth */
|
/* Fragment output depth */
|
||||||
ctx->Driver.GetFragmentProgramRegister(ctx, PROGRAM_OUTPUT,
|
ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
|
||||||
FRAG_RESULT_DEPR, v);
|
FRAG_RESULT_DEPR, v);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* try user-defined identifiers */
|
/* try user-defined identifiers */
|
||||||
|
Reference in New Issue
Block a user