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

mesa: Move _mesa_BindAttribLocationARB to shader_query.cpp

Browse Source 
This just folds bind_attrib_location into _mesa_BindAttribLocationARB
and moves the resulting function function to the other source file.
More changes are coming soon.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick
2011-08-17 15:35:09 -07:00
parent 3ea297bdc4
commit 2fd80534f0
2 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/mesa/main/shader_query.cpp
View File

@@ -37,6 +37,48 @@ extern "C" {
#include "shaderapi.h"
}
void GLAPIENTRY
_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
const GLcharARB *name)
{
GET_CURRENT_CONTEXT(ctx);
const GLint size = -1; /* unknown size */
GLint i;
GLenum datatype = GL_FLOAT_VEC4;
struct gl_shader_program *const shProg =
_mesa_lookup_shader_program_err(ctx, program, "glBindAttribLocation");
if (!shProg)
return;
if (!name)
return;
if (strncmp(name, "gl_", 3) == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glBindAttribLocation(illegal name)");
return;
}
if (index >= ctx->Const.VertexProgram.MaxAttribs) {
_mesa_error(ctx, GL_INVALID_VALUE, "glBindAttribLocation(index)");
return;
}
/* this will replace the current value if it's already in the list */
i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);
if (i < 0) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindAttribLocation");
return;
}
/*
* Note that this attribute binding won't go into effect until
* glLinkProgram is called again.
*/
}
GLint GLAPIENTRY
_mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name)
{

52
src/mesa/main/shaderapi.c
View File

@@ -324,49 +324,6 @@ attach_shader(struct gl_context *ctx, GLuint program, GLuint shader)
}
static void
bind_attrib_location(struct gl_context *ctx, GLuint program, GLuint index,
const GLchar *name)
{
struct gl_shader_program *shProg;
const GLint size = -1; /* unknown size */
GLint i;
GLenum datatype = GL_FLOAT_VEC4;
shProg = _mesa_lookup_shader_program_err(ctx, program,
"glBindAttribLocation");
if (!shProg) {
return;
}
if (!name)
return;
if (strncmp(name, "gl_", 3) == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glBindAttribLocation(illegal name)");
return;
}
if (index >= ctx->Const.VertexProgram.MaxAttribs) {
_mesa_error(ctx, GL_INVALID_VALUE, "glBindAttribLocation(index)");
return;
}
/* this will replace the current value if it's already in the list */
i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);
if (i < 0) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindAttribLocation");
return;
}
/*
* Note that this attribute binding won't go into effect until
* glLinkProgram is called again.
*/
}
static void
bind_frag_data_location(struct gl_context *ctx, GLuint program,
GLuint colorNumber, const GLchar *name)
@@ -1128,15 +1085,6 @@ _mesa_AttachShader(GLuint program, GLuint shader)
}
void GLAPIENTRY
_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
const GLcharARB *name)
{
GET_CURRENT_CONTEXT(ctx);
bind_attrib_location(ctx, program, index, name);
}
/* GL_EXT_gpu_shader4, GL3 */
void GLAPIENTRY
_mesa_BindFragDataLocation(GLuint program, GLuint colorNumber,