From b8042fb7fb15a4f99a10f9d9e48d43301622c2bf Mon Sep 17 00:00:00 2001 From: Brian Date: Tue, 30 Oct 2007 11:16:26 -0600 Subject: [PATCH] make st_upload_constants() public --- src/mesa/state_tracker/st_atom_constbuf.c | 19 +++++++++--- src/mesa/state_tracker/st_atom_constbuf.h | 38 +++++++++++++++++++++++ 2 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 src/mesa/state_tracker/st_atom_constbuf.h diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c index d140e0ef50b..7da71366761 100644 --- a/src/mesa/state_tracker/st_atom_constbuf.c +++ b/src/mesa/state_tracker/st_atom_constbuf.c @@ -40,15 +40,24 @@ #include "st_context.h" #include "st_atom.h" +#include "st_atom_constbuf.h" #include "st_program.h" -static void upload_constants( struct st_context *st, - struct gl_program_parameter_list *params, - unsigned id) + +/** + * Pass the given program parameters to the graphics pipe as a + * constant buffer. + * \param id either PIPE_SHADER_VERTEX or PIPE_SHADER_FRAGMENT + */ +void st_upload_constants( struct st_context *st, + struct gl_program_parameter_list *params, + unsigned id) { struct pipe_winsys *ws = st->pipe->winsys; struct pipe_constant_buffer *cbuf = &st->state.constants[id]; + assert(id == PIPE_SHADER_VERTEX || id == PIPE_SHADER_FRAGMENT); + /* update constants */ if (params && params->NumParameters) { const uint paramBytes = params->NumParameters * sizeof(GLfloat) * 4; @@ -90,7 +99,7 @@ static void update_vs_constants(struct st_context *st ) struct st_vertex_program *vp = st->vp; struct gl_program_parameter_list *params = vp->Base.Base.Parameters; - upload_constants( st, params, PIPE_SHADER_VERTEX ); + st_upload_constants( st, params, PIPE_SHADER_VERTEX ); } const struct st_tracked_state st_update_vs_constants = { @@ -109,7 +118,7 @@ static void update_fs_constants(struct st_context *st ) struct st_fragment_program *fp = st->fp; struct gl_program_parameter_list *params = fp->Base.Base.Parameters; - upload_constants( st, params, PIPE_SHADER_FRAGMENT ); + st_upload_constants( st, params, PIPE_SHADER_FRAGMENT ); } const struct st_tracked_state st_update_fs_constants = { diff --git a/src/mesa/state_tracker/st_atom_constbuf.h b/src/mesa/state_tracker/st_atom_constbuf.h new file mode 100644 index 00000000000..f707534e2cf --- /dev/null +++ b/src/mesa/state_tracker/st_atom_constbuf.h @@ -0,0 +1,38 @@ +/************************************************************************** + * + * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + **************************************************************************/ + + +#ifndef ST_ATOM_CONSTBUF_H +#define ST_ATOM_CONSTBUF_H + + +void st_upload_constants( struct st_context *st, + struct gl_program_parameter_list *params, + unsigned id); + + +#endif /* ST_ATOM_CONSTBUF_H */ -- 2.30.2