X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fshaderapi.h;h=b7ba7ab84a6af0270ed606b53ad572ec46c12bf5;hb=1ebe4305fd0e4b4f023eb50ca0b8229bdd7c1a5e;hp=90e2e2d25d40e5c76f2e6d981891ed8ff7010c6d;hpb=e2b59a39cbb64f6759f463f7bad162f5f03807b4;p=mesa.git diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index 90e2e2d25d4..b7ba7ab84a6 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -43,32 +43,52 @@ struct gl_shader_program; extern GLbitfield _mesa_get_shader_flags(void); +extern const char * +_mesa_get_shader_capture_path(void); + extern void _mesa_copy_string(GLchar *dst, GLsizei maxLength, GLsizei *length, const GLchar *src); extern void -_mesa_use_program(struct gl_context *ctx, struct gl_shader_program *shProg); +_mesa_use_shader_program(struct gl_context *ctx, + struct gl_shader_program *shProg); extern void _mesa_active_program(struct gl_context *ctx, struct gl_shader_program *shProg, const char *caller); +extern void +_mesa_compile_shader(struct gl_context *ctx, struct gl_shader *sh); + +extern void +_mesa_link_program(struct gl_context *ctx, struct gl_shader_program *sh_prog); + extern unsigned _mesa_count_active_attribs(struct gl_shader_program *shProg); extern size_t _mesa_longest_attribute_name_length(struct gl_shader_program *shProg); +extern void +_mesa_shader_write_subroutine_indices(struct gl_context *ctx, + gl_shader_stage stage); + +void GLAPIENTRY +_mesa_AttachObjectARB_no_error(GLhandleARB, GLhandleARB); + extern void GLAPIENTRY _mesa_AttachObjectARB(GLhandleARB, GLhandleARB); extern void GLAPIENTRY -_mesa_CompileShader(GLhandleARB); +_mesa_CompileShader(GLuint); extern GLhandleARB GLAPIENTRY _mesa_CreateProgramObjectARB(void); +GLhandleARB GLAPIENTRY +_mesa_CreateShaderObjectARB_no_error(GLenum type); + extern GLhandleARB GLAPIENTRY _mesa_CreateShaderObjectARB(GLenum type); @@ -100,7 +120,7 @@ extern void GLAPIENTRY _mesa_GetObjectParameterivARB(GLhandleARB, GLenum, GLint *); extern void GLAPIENTRY -_mesa_GetShaderSource(GLhandleARB, GLsizei, GLsizei *, GLcharARB *); +_mesa_GetShaderSource(GLuint, GLsizei, GLsizei *, GLchar *); extern GLboolean GLAPIENTRY _mesa_IsProgram(GLuint name); @@ -109,20 +129,25 @@ extern GLboolean GLAPIENTRY _mesa_IsShader(GLuint name); extern void GLAPIENTRY -_mesa_LinkProgram(GLhandleARB programObj); +_mesa_LinkProgram(GLuint programObj); extern void GLAPIENTRY -_mesa_ShaderSource(GLhandleARB, GLsizei, const GLcharARB* const *, const GLint *); +_mesa_ShaderSource(GLuint, GLsizei, const GLchar* const *, const GLint *); +void GLAPIENTRY +_mesa_UseProgram_no_error(GLuint); extern void GLAPIENTRY -_mesa_UseProgram(GLhandleARB); +_mesa_UseProgram(GLuint); extern void GLAPIENTRY -_mesa_ValidateProgram(GLhandleARB); +_mesa_ValidateProgram(GLuint); +void GLAPIENTRY +_mesa_BindAttribLocation_no_error(GLuint program, GLuint, const GLchar *); + extern void GLAPIENTRY -_mesa_BindAttribLocation(GLhandleARB, GLuint, const GLcharARB *); +_mesa_BindAttribLocation(GLuint program, GLuint, const GLchar *); extern void GLAPIENTRY _mesa_BindFragDataLocation(GLuint program, GLuint colorNumber, @@ -133,17 +158,29 @@ _mesa_BindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); extern void GLAPIENTRY -_mesa_GetActiveAttrib(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, - GLenum *, GLcharARB *); +_mesa_BindFragDataLocation_no_error(GLuint program, GLuint colorNumber, + const GLchar *name); -extern GLint GLAPIENTRY -_mesa_GetAttribLocation(GLhandleARB, const GLcharARB *); +extern void GLAPIENTRY +_mesa_BindFragDataLocationIndexed_no_error(GLuint program, GLuint colorNumber, + GLuint index, const GLchar *name); +extern void GLAPIENTRY +_mesa_GetActiveAttrib(GLuint, GLuint, GLsizei, GLsizei *, GLint *, + GLenum *, GLchar *); + +extern GLint GLAPIENTRY +_mesa_GetAttribLocation(GLuint, const GLchar *); +void GLAPIENTRY +_mesa_AttachShader_no_error(GLuint program, GLuint shader); extern void GLAPIENTRY _mesa_AttachShader(GLuint program, GLuint shader); +GLuint GLAPIENTRY +_mesa_CreateShader_no_error(GLenum); + extern GLuint GLAPIENTRY _mesa_CreateShader(GLenum); @@ -201,14 +238,13 @@ extern void GLAPIENTRY _mesa_ProgramParameteri(GLuint program, GLenum pname, GLint value); void -_mesa_use_shader_program(struct gl_context *ctx, GLenum type, - struct gl_shader_program *shProg, - struct gl_pipeline_object *shTarget); +_mesa_use_program(struct gl_context *ctx, gl_shader_stage stage, + struct gl_shader_program *shProg, struct gl_program *prog, + struct gl_pipeline_object *shTarget); extern void -_mesa_copy_linked_program_data(gl_shader_stage type, - const struct gl_shader_program *src, - struct gl_program *dst); +_mesa_copy_linked_program_data(const struct gl_shader_program *src, + struct gl_linked_shader *dst_sh); extern bool _mesa_validate_shader_target(const struct gl_context *ctx, GLenum type); @@ -232,7 +268,8 @@ _mesa_program_resource_index(struct gl_shader_program *shProg, extern struct gl_program_resource * _mesa_program_resource_find_name(struct gl_shader_program *shProg, - GLenum programInterface, const char *name); + GLenum programInterface, const char *name, + unsigned *array_index); extern struct gl_program_resource * _mesa_program_resource_find_index(struct gl_shader_program *shProg, @@ -244,6 +281,9 @@ _mesa_get_program_resource_name(struct gl_shader_program *shProg, GLsizei bufSize, GLsizei *length, GLchar *name, const char *caller); +extern unsigned +_mesa_program_resource_name_len(struct gl_program_resource *res); + extern GLint _mesa_program_resource_location(struct gl_shader_program *shProg, GLenum programInterface, const char *name); @@ -271,6 +311,44 @@ _mesa_PatchParameteri(GLenum pname, GLint value); extern void GLAPIENTRY _mesa_PatchParameterfv(GLenum pname, const GLfloat *values); +/* GL_ARB_shader_subroutine */ +void +_mesa_program_init_subroutine_defaults(struct gl_context *ctx, + struct gl_program *prog); + +extern GLint GLAPIENTRY +_mesa_GetSubroutineUniformLocation(GLuint program, GLenum shadertype, + const GLchar *name); + +extern GLuint GLAPIENTRY +_mesa_GetSubroutineIndex(GLuint program, GLenum shadertype, + const GLchar *name); + +extern GLvoid GLAPIENTRY +_mesa_GetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, + GLuint index, GLenum pname, GLint *values); + +extern GLvoid GLAPIENTRY +_mesa_GetActiveSubroutineUniformName(GLuint program, GLenum shadertype, + GLuint index, GLsizei bufsize, + GLsizei *length, GLchar *name); + +extern GLvoid GLAPIENTRY +_mesa_GetActiveSubroutineName(GLuint program, GLenum shadertype, + GLuint index, GLsizei bufsize, + GLsizei *length, GLchar *name); + +extern GLvoid GLAPIENTRY +_mesa_UniformSubroutinesuiv(GLenum shadertype, GLsizei count, + const GLuint *indices); + +extern GLvoid GLAPIENTRY +_mesa_GetUniformSubroutineuiv(GLenum shadertype, GLint location, + GLuint *params); + +extern GLvoid GLAPIENTRY +_mesa_GetProgramStageiv(GLuint program, GLenum shadertype, + GLenum pname, GLint *values); #ifdef __cplusplus }