fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: make _mesa_get_proxy_target() non-static

Browse source 
Needed for the next patch.

Note: This is a candidate for the stable branches.
This commit is contained in:
Brian Paul 2012-09-08 09:46:14 -06:00
parent 2e4fc54977
commit d17440dcaa
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/main/teximage.c
View file

@ -660,8 +660,8 @@ _mesa_is_proxy_texture(GLenum target)
/**
* Return the proxy target which corresponds to the given texture target
*/
static GLenum
get_proxy_target(GLenum target)
GLenum
_mesa_get_proxy_target(GLenum target)
{
switch (target) {
case GL_TEXTURE_1D:
@ -692,7 +692,7 @@ get_proxy_target(GLenum target)
case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
return GL_PROXY_TEXTURE_2D_ARRAY_EXT;
default:
_mesa_problem(NULL, "unexpected target in get_proxy_target()");
_mesa_problem(NULL, "unexpected target in _mesa_get_proxy_target()");
return 0;
}
}
@ -1703,7 +1703,7 @@ texture_error_check( struct gl_context *ctx,
GLint width, GLint height,
GLint depth, GLint border )
{
const GLenum proxyTarget = get_proxy_target(target);
const GLenum proxyTarget = _mesa_get_proxy_target(target);
const GLboolean isProxy = target == proxyTarget;
GLboolean sizeOK = GL_TRUE;
GLboolean colorFormat;
@ -1933,7 +1933,7 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
GLsizei height, GLsizei depth, GLint border,
GLsizei imageSize)
{
const GLenum proxyTarget = get_proxy_target(target);
const GLenum proxyTarget = _mesa_get_proxy_target(target);
const GLint maxLevels = _mesa_max_texture_levels(ctx, target);
GLint expectedSize;
GLenum choose_format;
@ -2308,7 +2308,7 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
GLenum target, GLint level, GLint internalFormat,
GLint width, GLint height, GLint border )
{
const GLenum proxyTarget = get_proxy_target(target);
const GLenum proxyTarget = _mesa_get_proxy_target(target);
const GLenum type = GL_FLOAT;
GLboolean sizeOK;
GLint baseFormat;

2
src/mesa/main/teximage.h
View file

@ -66,6 +66,8 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat );
extern GLboolean
_mesa_is_proxy_texture(GLenum target);
extern GLenum
_mesa_get_proxy_target(GLenum target);
extern struct gl_texture_image *
_mesa_new_texture_image( struct gl_context *ctx );