X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fpipelineobj.c;h=b4ca14d7257de4e036c72a71695d334062f23e9d;hb=e66c2158f86d798fc25555d493febc5c9e778899;hp=e777f991589e5670fb390d767cc9bd38208382bc;hpb=aad93402c00ae90274d7abdbb64960d9ae40a0ce;p=mesa.git diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index e777f991589..b4ca14d7257 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -34,13 +34,13 @@ #include #include "main/glheader.h" #include "main/context.h" -#include "main/dispatch.h" #include "main/enums.h" #include "main/hash.h" #include "main/mtypes.h" #include "main/pipelineobj.h" #include "main/shaderapi.h" #include "main/shaderobj.h" +#include "main/state.h" #include "main/transformfeedback.h" #include "main/uniforms.h" #include "compiler/glsl/glsl_parser_extras.h" @@ -58,13 +58,12 @@ _mesa_delete_pipeline_object(struct gl_context *ctx, { unsigned i; - _mesa_reference_program(ctx, &obj->_CurrentFragmentProgram, NULL); - - for (i = 0; i < MESA_SHADER_STAGES; i++) - _mesa_reference_shader_program(ctx, &obj->CurrentProgram[i], NULL); + for (i = 0; i < MESA_SHADER_STAGES; i++) { + _mesa_reference_program(ctx, &obj->CurrentProgram[i], NULL); + _mesa_reference_shader_program(ctx, &obj->ReferencedPrograms[i], NULL); + } _mesa_reference_shader_program(ctx, &obj->ActiveProgram, NULL); - mtx_destroy(&obj->Mutex); free(obj->Label); ralloc_free(obj); } @@ -78,7 +77,6 @@ _mesa_new_pipeline_object(struct gl_context *ctx, GLuint name) struct gl_pipeline_object *obj = rzalloc(NULL, struct gl_pipeline_object); if (obj) { obj->Name = name; - mtx_init(&obj->Mutex, mtx_plain); obj->RefCount = 1; obj->Flags = _mesa_get_shader_flags(); obj->InfoLog = NULL; @@ -144,7 +142,7 @@ _mesa_lookup_pipeline_object(struct gl_context *ctx, GLuint id) return NULL; else return (struct gl_pipeline_object *) - _mesa_HashLookup(ctx->Pipeline.Objects, id); + _mesa_HashLookupLocked(ctx->Pipeline.Objects, id); } /** @@ -154,7 +152,7 @@ static void save_pipeline_object(struct gl_context *ctx, struct gl_pipeline_object *obj) { if (obj->Name > 0) { - _mesa_HashInsert(ctx->Pipeline.Objects, obj->Name, obj); + _mesa_HashInsertLocked(ctx->Pipeline.Objects, obj->Name, obj); } } @@ -166,7 +164,7 @@ static void remove_pipeline_object(struct gl_context *ctx, struct gl_pipeline_object *obj) { if (obj->Name > 0) { - _mesa_HashRemove(ctx->Pipeline.Objects, obj->Name); + _mesa_HashRemoveLocked(ctx->Pipeline.Objects, obj->Name); } } @@ -184,16 +182,12 @@ _mesa_reference_pipeline_object_(struct gl_context *ctx, if (*ptr) { /* Unreference the old pipeline object */ - GLboolean deleteFlag = GL_FALSE; struct gl_pipeline_object *oldObj = *ptr; - mtx_lock(&oldObj->Mutex); assert(oldObj->RefCount > 0); oldObj->RefCount--; - deleteFlag = (oldObj->RefCount == 0); - mtx_unlock(&oldObj->Mutex); - if (deleteFlag) { + if (oldObj->RefCount == 0) { _mesa_delete_pipeline_object(ctx, oldObj); } @@ -203,21 +197,84 @@ _mesa_reference_pipeline_object_(struct gl_context *ctx, if (obj) { /* reference new pipeline object */ - mtx_lock(&obj->Mutex); - if (obj->RefCount == 0) { - /* this pipeline's being deleted (look just above) */ - /* Not sure this can ever really happen. Warn if it does. */ - _mesa_problem(NULL, "referencing deleted pipeline object"); - *ptr = NULL; - } - else { - obj->RefCount++; - *ptr = obj; - } - mtx_unlock(&obj->Mutex); + assert(obj->RefCount > 0); + + obj->RefCount++; + *ptr = obj; } } +static void +use_program_stage(struct gl_context *ctx, GLenum type, + struct gl_shader_program *shProg, + struct gl_pipeline_object *pipe) { + gl_shader_stage stage = _mesa_shader_enum_to_shader_stage(type); + struct gl_program *prog = NULL; + if (shProg && shProg->_LinkedShaders[stage]) + prog = shProg->_LinkedShaders[stage]->Program; + + _mesa_use_program(ctx, stage, shProg, prog, pipe); +} + +static void +use_program_stages(struct gl_context *ctx, struct gl_shader_program *shProg, + GLbitfield stages, struct gl_pipeline_object *pipe) { + + /* Enable individual stages from the program as requested by the + * application. If there is no shader for a requested stage in the + * program, _mesa_use_shader_program will enable fixed-function processing + * as dictated by the spec. + * + * Section 2.11.4 (Program Pipeline Objects) of the OpenGL 4.1 spec + * says: + * + * "If UseProgramStages is called with program set to zero or with a + * program object that contains no executable code for the given + * stages, it is as if the pipeline object has no programmable stage + * configured for the indicated shader stages." + */ + if ((stages & GL_VERTEX_SHADER_BIT) != 0) + use_program_stage(ctx, GL_VERTEX_SHADER, shProg, pipe); + + if ((stages & GL_FRAGMENT_SHADER_BIT) != 0) + use_program_stage(ctx, GL_FRAGMENT_SHADER, shProg, pipe); + + if ((stages & GL_GEOMETRY_SHADER_BIT) != 0) + use_program_stage(ctx, GL_GEOMETRY_SHADER, shProg, pipe); + + if ((stages & GL_TESS_CONTROL_SHADER_BIT) != 0) + use_program_stage(ctx, GL_TESS_CONTROL_SHADER, shProg, pipe); + + if ((stages & GL_TESS_EVALUATION_SHADER_BIT) != 0) + use_program_stage(ctx, GL_TESS_EVALUATION_SHADER, shProg, pipe); + + if ((stages & GL_COMPUTE_SHADER_BIT) != 0) + use_program_stage(ctx, GL_COMPUTE_SHADER, shProg, pipe); + + pipe->Validated = false; +} + +void GLAPIENTRY +_mesa_UseProgramStages_no_error(GLuint pipeline, GLbitfield stages, + GLuint prog) +{ + GET_CURRENT_CONTEXT(ctx); + + struct gl_pipeline_object *pipe = + _mesa_lookup_pipeline_object(ctx, pipeline); + struct gl_shader_program *shProg = NULL; + + if (prog) + shProg = _mesa_lookup_shader_program(ctx, prog); + + /* Object is created by any Pipeline call but glGenProgramPipelines, + * glIsProgramPipeline and GetProgramPipelineInfoLog + */ + pipe->EverBound = GL_TRUE; + + use_program_stages(ctx, shProg, stages, pipe); +} + /** * Bound program to severals stages of the pipeline */ @@ -311,62 +368,28 @@ _mesa_UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program) } } - /* Enable individual stages from the program as requested by the - * application. If there is no shader for a requested stage in the - * program, _mesa_use_shader_program will enable fixed-function processing - * as dictated by the spec. - * - * Section 2.11.4 (Program Pipeline Objects) of the OpenGL 4.1 spec - * says: - * - * "If UseProgramStages is called with program set to zero or with a - * program object that contains no executable code for the given - * stages, it is as if the pipeline object has no programmable stage - * configured for the indicated shader stages." - */ - if ((stages & GL_VERTEX_SHADER_BIT) != 0) - _mesa_use_shader_program(ctx, GL_VERTEX_SHADER, shProg, pipe); - - if ((stages & GL_FRAGMENT_SHADER_BIT) != 0) - _mesa_use_shader_program(ctx, GL_FRAGMENT_SHADER, shProg, pipe); - - if ((stages & GL_GEOMETRY_SHADER_BIT) != 0) - _mesa_use_shader_program(ctx, GL_GEOMETRY_SHADER, shProg, pipe); - - if ((stages & GL_TESS_CONTROL_SHADER_BIT) != 0) - _mesa_use_shader_program(ctx, GL_TESS_CONTROL_SHADER, shProg, pipe); - - if ((stages & GL_TESS_EVALUATION_SHADER_BIT) != 0) - _mesa_use_shader_program(ctx, GL_TESS_EVALUATION_SHADER, shProg, pipe); - - if ((stages & GL_COMPUTE_SHADER_BIT) != 0) - _mesa_use_shader_program(ctx, GL_COMPUTE_SHADER, shProg, pipe); - - pipe->Validated = false; + use_program_stages(ctx, shProg, stages, pipe); } -/** - * Use the named shader program for subsequent glUniform calls (if pipeline - * bound) - */ -void GLAPIENTRY -_mesa_ActiveShaderProgram(GLuint pipeline, GLuint program) +static ALWAYS_INLINE void +active_shader_program(struct gl_context *ctx, GLuint pipeline, GLuint program, + bool no_error) { - GET_CURRENT_CONTEXT(ctx); struct gl_shader_program *shProg = NULL; struct gl_pipeline_object *pipe = _mesa_lookup_pipeline_object(ctx, pipeline); - if (MESA_VERBOSE & VERBOSE_API) - _mesa_debug(ctx, "glActiveShaderProgram(%u, %u)\n", pipeline, program); - - if (program != 0) { - shProg = _mesa_lookup_shader_program_err(ctx, program, - "glActiveShaderProgram(program)"); - if (shProg == NULL) - return; + if (program) { + if (no_error) { + shProg = _mesa_lookup_shader_program(ctx, program); + } else { + shProg = _mesa_lookup_shader_program_err(ctx, program, + "glActiveShaderProgram(program)"); + if (shProg == NULL) + return; + } } - if (!pipe) { + if (!no_error && !pipe) { _mesa_error(ctx, GL_INVALID_OPERATION, "glActiveShaderProgram(pipeline)"); return; } @@ -376,7 +399,7 @@ _mesa_ActiveShaderProgram(GLuint pipeline, GLuint program) */ pipe->EverBound = GL_TRUE; - if ((shProg != NULL) && !shProg->data->LinkStatus) { + if (!no_error && shProg != NULL && !shProg->data->LinkStatus) { _mesa_error(ctx, GL_INVALID_OPERATION, "glActiveShaderProgram(program %u not linked)", shProg->Name); return; @@ -385,13 +408,31 @@ _mesa_ActiveShaderProgram(GLuint pipeline, GLuint program) _mesa_reference_shader_program(ctx, &pipe->ActiveProgram, shProg); } +void GLAPIENTRY +_mesa_ActiveShaderProgram_no_error(GLuint pipeline, GLuint program) +{ + GET_CURRENT_CONTEXT(ctx); + active_shader_program(ctx, pipeline, program, true); +} + /** - * Make program of the pipeline current + * Use the named shader program for subsequent glUniform calls (if pipeline + * bound) */ void GLAPIENTRY -_mesa_BindProgramPipeline(GLuint pipeline) +_mesa_ActiveShaderProgram(GLuint pipeline, GLuint program) { GET_CURRENT_CONTEXT(ctx); + + if (MESA_VERBOSE & VERBOSE_API) + _mesa_debug(ctx, "glActiveShaderProgram(%u, %u)\n", pipeline, program); + + active_shader_program(ctx, pipeline, program, false); +} + +static ALWAYS_INLINE void +bind_program_pipeline(struct gl_context *ctx, GLuint pipeline, bool no_error) +{ struct gl_pipeline_object *newObj = NULL; if (MESA_VERBOSE & VERBOSE_API) @@ -412,7 +453,7 @@ _mesa_BindProgramPipeline(GLuint pipeline) * - by BindProgramPipeline if the current transform feedback * object is active and not paused; */ - if (_mesa_is_xfb_active_and_unpaused(ctx)) { + if (!no_error && _mesa_is_xfb_active_and_unpaused(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "glBindProgramPipeline(transform feedback active)"); return; @@ -423,7 +464,7 @@ _mesa_BindProgramPipeline(GLuint pipeline) if (pipeline) { /* non-default pipeline object */ newObj = _mesa_lookup_pipeline_object(ctx, pipeline); - if (!newObj) { + if (!no_error && !newObj) { _mesa_error(ctx, GL_INVALID_OPERATION, "glBindProgramPipeline(non-gen name)"); return; @@ -438,6 +479,23 @@ _mesa_BindProgramPipeline(GLuint pipeline) _mesa_bind_pipeline(ctx, newObj); } +void GLAPIENTRY +_mesa_BindProgramPipeline_no_error(GLuint pipeline) +{ + GET_CURRENT_CONTEXT(ctx); + bind_program_pipeline(ctx, pipeline, true); +} + +/** + * Make program of the pipeline current + */ +void GLAPIENTRY +_mesa_BindProgramPipeline(GLuint pipeline) +{ + GET_CURRENT_CONTEXT(ctx); + bind_program_pipeline(ctx, pipeline, false); +} + void _mesa_bind_pipeline(struct gl_context *ctx, struct gl_pipeline_object *pipe) @@ -455,6 +513,8 @@ _mesa_bind_pipeline(struct gl_context *ctx, * considered current." */ if (&ctx->Shader != ctx->_Shader) { + FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS); + if (pipe != NULL) { /* Bound the pipeline to the current program and * restore the pipeline state @@ -466,16 +526,14 @@ _mesa_bind_pipeline(struct gl_context *ctx, ctx->Pipeline.Default); } - FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS); - for (i = 0; i < MESA_SHADER_STAGES; i++) { - if (ctx->_Shader->CurrentProgram[i]) { - struct gl_linked_shader *sh = - ctx->_Shader->CurrentProgram[i]->_LinkedShaders[i]; - if (sh) - _mesa_program_init_subroutine_defaults(ctx, sh->Program); + struct gl_program *prog = ctx->_Shader->CurrentProgram[i]; + if (prog) { + _mesa_program_init_subroutine_defaults(ctx, prog); } } + + _mesa_update_vertex_processing_mode(ctx); } } @@ -535,20 +593,12 @@ static void create_program_pipelines(struct gl_context *ctx, GLsizei n, GLuint *pipelines, bool dsa) { - const char *func; + const char *func = dsa ? "glCreateProgramPipelines" : "glGenProgramPipelines"; GLuint first; GLint i; - func = dsa ? "glCreateProgramPipelines" : "glGenProgramPipelines"; - - if (n < 0) { - _mesa_error(ctx, GL_INVALID_VALUE, "%s (n < 0)", func); + if (!pipelines) return; - } - - if (!pipelines) { - return; - } first = _mesa_HashFindFreeKeyBlock(ctx->Pipeline.Objects, n); @@ -570,7 +620,27 @@ create_program_pipelines(struct gl_context *ctx, GLsizei n, GLuint *pipelines, save_pipeline_object(ctx, obj); pipelines[i] = first + i; } +} + +static void +create_program_pipelines_err(struct gl_context *ctx, GLsizei n, + GLuint *pipelines, bool dsa) +{ + const char *func = dsa ? "glCreateProgramPipelines" : "glGenProgramPipelines"; + if (n < 0) { + _mesa_error(ctx, GL_INVALID_VALUE, "%s (n < 0)", func); + return; + } + + create_program_pipelines(ctx, n, pipelines, dsa); +} + +void GLAPIENTRY +_mesa_GenProgramPipelines_no_error(GLsizei n, GLuint *pipelines) +{ + GET_CURRENT_CONTEXT(ctx); + create_program_pipelines(ctx, n, pipelines, false); } void GLAPIENTRY @@ -581,7 +651,14 @@ _mesa_GenProgramPipelines(GLsizei n, GLuint *pipelines) if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glGenProgramPipelines(%d, %p)\n", n, pipelines); - create_program_pipelines(ctx, n, pipelines, false); + create_program_pipelines_err(ctx, n, pipelines, false); +} + +void GLAPIENTRY +_mesa_CreateProgramPipelines_no_error(GLsizei n, GLuint *pipelines) +{ + GET_CURRENT_CONTEXT(ctx); + create_program_pipelines(ctx, n, pipelines, true); } void GLAPIENTRY @@ -592,7 +669,7 @@ _mesa_CreateProgramPipelines(GLsizei n, GLuint *pipelines) if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glCreateProgramPipelines(%d, %p)\n", n, pipelines); - create_program_pipelines(ctx, n, pipelines, true); + create_program_pipelines_err(ctx, n, pipelines, true); } /** @@ -659,35 +736,35 @@ _mesa_GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params) return; case GL_VERTEX_SHADER: *params = pipe->CurrentProgram[MESA_SHADER_VERTEX] - ? pipe->CurrentProgram[MESA_SHADER_VERTEX]->Name : 0; + ? pipe->CurrentProgram[MESA_SHADER_VERTEX]->Id : 0; return; case GL_TESS_EVALUATION_SHADER: if (!has_tess) break; *params = pipe->CurrentProgram[MESA_SHADER_TESS_EVAL] - ? pipe->CurrentProgram[MESA_SHADER_TESS_EVAL]->Name : 0; + ? pipe->CurrentProgram[MESA_SHADER_TESS_EVAL]->Id : 0; return; case GL_TESS_CONTROL_SHADER: if (!has_tess) break; *params = pipe->CurrentProgram[MESA_SHADER_TESS_CTRL] - ? pipe->CurrentProgram[MESA_SHADER_TESS_CTRL]->Name : 0; + ? pipe->CurrentProgram[MESA_SHADER_TESS_CTRL]->Id : 0; return; case GL_GEOMETRY_SHADER: if (!has_gs) break; *params = pipe->CurrentProgram[MESA_SHADER_GEOMETRY] - ? pipe->CurrentProgram[MESA_SHADER_GEOMETRY]->Name : 0; + ? pipe->CurrentProgram[MESA_SHADER_GEOMETRY]->Id : 0; return; case GL_FRAGMENT_SHADER: *params = pipe->CurrentProgram[MESA_SHADER_FRAGMENT] - ? pipe->CurrentProgram[MESA_SHADER_FRAGMENT]->Name : 0; + ? pipe->CurrentProgram[MESA_SHADER_FRAGMENT]->Id : 0; return; case GL_COMPUTE_SHADER: if (!_mesa_has_compute_shaders(ctx)) break; *params = pipe->CurrentProgram[MESA_SHADER_COMPUTE] - ? pipe->CurrentProgram[MESA_SHADER_COMPUTE]->Name : 0; + ? pipe->CurrentProgram[MESA_SHADER_COMPUTE]->Id : 0; return; default: break; @@ -703,23 +780,22 @@ _mesa_GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params) */ static bool program_stages_all_active(struct gl_pipeline_object *pipe, - const struct gl_shader_program *prog) + const struct gl_program *prog) { - unsigned i; bool status = true; if (!prog) return true; - for (i = 0; i < MESA_SHADER_STAGES; i++) { - if (prog->_LinkedShaders[i]) { - if (pipe->CurrentProgram[i]) { - if (prog->Name != pipe->CurrentProgram[i]->Name) { - status = false; - } - } else { + unsigned mask = prog->sh.data->linked_stages; + while (mask) { + const int i = u_bit_scan(&mask); + if (pipe->CurrentProgram[i]) { + if (prog->Id != pipe->CurrentProgram[i]->Id) { status = false; } + } else { + status = false; } } @@ -727,7 +803,7 @@ program_stages_all_active(struct gl_pipeline_object *pipe, pipe->InfoLog = ralloc_asprintf(pipe, "Program %d is not active for all " "shaders that was linked", - prog->Name); + prog->Id); } return status; @@ -742,7 +818,7 @@ program_stages_interleaved_illegally(const struct gl_pipeline_object *pipe) * sequence of unrelated programs or empty stages. */ for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) { - struct gl_shader_program *cur = pipe->CurrentProgram[i]; + struct gl_program *cur = pipe->CurrentProgram[i]; /* Empty stages anywhere in the pipe are OK. Also we can be confident * that if the linked_stages mask matches we are looking at the same @@ -751,7 +827,7 @@ program_stages_interleaved_illegally(const struct gl_pipeline_object *pipe) * programs with the sames stages linked are not active for all linked * stages. */ - if (!cur || cur->data->linked_stages == prev_linked_stages) + if (!cur || cur->sh.data->linked_stages == prev_linked_stages) continue; if (prev_linked_stages) { @@ -762,7 +838,7 @@ program_stages_interleaved_illegally(const struct gl_pipeline_object *pipe) return true; } - prev_linked_stages = cur->data->linked_stages; + prev_linked_stages = cur->sh.data->linked_stages; } return false; @@ -861,11 +937,12 @@ _mesa_validate_program_pipeline(struct gl_context* ctx, * PROGRAM_SEPARABLE parameter set to FALSE. */ for (i = 0; i < MESA_SHADER_STAGES; i++) { - if (pipe->CurrentProgram[i] && !pipe->CurrentProgram[i]->SeparateShader) { + if (pipe->CurrentProgram[i] && + !pipe->CurrentProgram[i]->info.separate_shader) { pipe->InfoLog = ralloc_asprintf(pipe, "Program %d was relinked without " "PROGRAM_SEPARABLE state", - pipe->CurrentProgram[i]->Name); + pipe->CurrentProgram[i]->Id); return GL_FALSE; } }