summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-04-16 09:45:56 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-04-16 16:53:43 -0600
commitdc5a853c85d2daa8b7b0e6d32e00c4976746d704 (patch)
tree52f36de7bf5d52677bbac753a9b214aaa32cec44
parente38f677e8f5596d92a6756e13f41f6523de737c2 (diff)
gallium: make choose_format() non-static: st_choose_format()
-rw-r--r--src/mesa/state_tracker/st_format.c9
-rw-r--r--src/mesa/state_tracker/st_format.h4
2 files changed, 9 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index cd41dc4684..3d15a03cab 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -354,8 +354,9 @@ default_depth_format(struct pipe_screen *screen, uint type)
* Given an OpenGL internalFormat value for a texture or surface, return
* the best matching PIPE_FORMAT_x, or PIPE_FORMAT_NONE if there's no match.
*/
-static enum pipe_format
-choose_format(struct pipe_context *pipe, GLint internalFormat, uint surfType)
+enum pipe_format
+st_choose_format(struct pipe_context *pipe, GLint internalFormat,
+ uint surfType)
{
struct pipe_screen *screen = pipe->screen;
@@ -530,7 +531,7 @@ choose_format(struct pipe_context *pipe, GLint internalFormat, uint surfType)
enum pipe_format
st_choose_renderbuffer_format(struct pipe_context *pipe, GLint internalFormat)
{
- return choose_format(pipe, internalFormat, PIPE_SURFACE);
+ return st_choose_format(pipe, internalFormat, PIPE_SURFACE);
}
@@ -594,7 +595,7 @@ st_ChooseTextureFormat(GLcontext *ctx, GLint internalFormat,
(void) format;
(void) type;
- pFormat = choose_format(ctx->st->pipe, internalFormat, PIPE_TEXTURE);
+ pFormat = st_choose_format(ctx->st->pipe, internalFormat, PIPE_TEXTURE);
if (pFormat == PIPE_FORMAT_NONE)
return NULL;
diff --git a/src/mesa/state_tracker/st_format.h b/src/mesa/state_tracker/st_format.h
index c9a11de504..ff0fd042db 100644
--- a/src/mesa/state_tracker/st_format.h
+++ b/src/mesa/state_tracker/st_format.h
@@ -64,6 +64,10 @@ st_mesa_format_to_pipe_format(GLuint mesaFormat);
extern enum pipe_format
+st_choose_format(struct pipe_context *pipe, GLint internalFormat,
+ uint surfType);
+
+extern enum pipe_format
st_choose_renderbuffer_format(struct pipe_context *pipe, GLint internalFormat);