glsl: pass datatype to _mesa_add_varying()
Will be needed later for transform feedback support.
This commit is contained in:
@@ -376,7 +376,8 @@ _mesa_add_sampler(struct gl_program_parameter_list *paramList,
|
||||
*/
|
||||
GLint
|
||||
_mesa_add_varying(struct gl_program_parameter_list *paramList,
|
||||
const char *name, GLuint size, GLbitfield flags)
|
||||
const char *name, GLuint size, GLenum datatype,
|
||||
GLbitfield flags)
|
||||
{
|
||||
GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
|
||||
if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_VARYING) {
|
||||
@@ -386,7 +387,7 @@ _mesa_add_varying(struct gl_program_parameter_list *paramList,
|
||||
else {
|
||||
/*assert(size == 4);*/
|
||||
i = _mesa_add_parameter(paramList, PROGRAM_VARYING, name,
|
||||
size, GL_NONE, NULL, NULL, flags);
|
||||
size, datatype, NULL, NULL, flags);
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -146,7 +146,8 @@ _mesa_add_sampler(struct gl_program_parameter_list *paramList,
|
||||
|
||||
extern GLint
|
||||
_mesa_add_varying(struct gl_program_parameter_list *paramList,
|
||||
const char *name, GLuint size, GLbitfield flags);
|
||||
const char *name, GLuint size, GLenum datatype,
|
||||
GLbitfield flags);
|
||||
|
||||
extern GLint
|
||||
_mesa_add_attribute(struct gl_program_parameter_list *paramList,
|
||||
|
||||
@@ -5130,7 +5130,7 @@ _slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var,
|
||||
flags |= PROG_PARAM_BIT_INVARIANT;
|
||||
|
||||
varyingLoc = _mesa_add_varying(prog->Varying, varName,
|
||||
totalSize, flags);
|
||||
totalSize, GL_NONE, flags);
|
||||
swizzle = _slang_var_swizzle(size, 0);
|
||||
store = _slang_new_ir_storage_swz(PROGRAM_VARYING, varyingLoc,
|
||||
totalSize, swizzle);
|
||||
|
||||
@@ -157,7 +157,7 @@ link_varying_vars(GLcontext *ctx,
|
||||
else {
|
||||
/* not already in linked list */
|
||||
j = _mesa_add_varying(shProg->Varying, var->Name, var->Size,
|
||||
var->Flags);
|
||||
var->DataType, var->Flags);
|
||||
}
|
||||
|
||||
if (shProg->Varying->NumParameters > ctx->Const.MaxVarying) {
|
||||
|
||||
Reference in New Issue
Block a user