main: Added entry point for glTextureParameterf.

Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Laura Ekstrand
2014-12-10 16:33:18 -08:00
parent 5ad5393f3b
commit abc688e33a
4 changed files with 66 additions and 10 deletions

View File

@@ -75,6 +75,12 @@
<param name="pixels" type="const GLvoid *" /> <param name="pixels" type="const GLvoid *" />
</function> </function>
<function name="TextureParameterf" offset="assign">
<param name="texture" type="GLuint" />
<param name="pname" type="GLenum" />
<param name="param" type="GLfloat" />
</function>
<function name="BindTextureUnit" offset="assign"> <function name="BindTextureUnit" offset="assign">
<param name="unit" type="GLuint" /> <param name="unit" type="GLuint" />
<param name="texture" type="GLuint" /> <param name="texture" type="GLuint" />

View File

@@ -963,6 +963,7 @@ const struct function gl_core_functions_possible[] = {
{ "glTextureSubImage2D", 45, -1 }, { "glTextureSubImage2D", 45, -1 },
{ "glTextureSubImage3D", 45, -1 }, { "glTextureSubImage3D", 45, -1 },
{ "glBindTextureUnit", 45, -1 }, { "glBindTextureUnit", 45, -1 },
{ "glTextureParameterf", 45, -1 },
{ NULL, 0, -1 } { NULL, 0, -1 }
}; };

View File

@@ -756,16 +756,12 @@ invalid_enum:
} }
void GLAPIENTRY void
_mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param) _mesa_texture_parameterf(struct gl_context *ctx,
struct gl_texture_object *texObj,
GLenum pname, GLfloat param, bool dsa)
{ {
GLboolean need_update; GLboolean need_update;
struct gl_texture_object *texObj;
GET_CURRENT_CONTEXT(ctx);
texObj = get_texobj_by_target(ctx, target, GL_FALSE);
if (!texObj)
return;
switch (pname) { switch (pname) {
case GL_TEXTURE_MIN_FILTER: case GL_TEXTURE_MIN_FILTER:
@@ -793,16 +789,21 @@ _mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
((param < INT_MIN) ? INT_MIN : (GLint) (param - 0.5)); ((param < INT_MIN) ? INT_MIN : (GLint) (param - 0.5));
p[1] = p[2] = p[3] = 0; p[1] = p[2] = p[3] = 0;
need_update = set_tex_parameteri(ctx, texObj, pname, p, false); need_update = set_tex_parameteri(ctx, texObj, pname, p, dsa);
} }
break; break;
case GL_TEXTURE_BORDER_COLOR:
case GL_TEXTURE_SWIZZLE_RGBA:
_mesa_error(ctx, GL_INVALID_ENUM, "glTex%sParameterf(non-scalar pname)",
dsa ? "ture" : "");
return;
default: default:
{ {
/* this will generate an error if pname is illegal */ /* this will generate an error if pname is illegal */
GLfloat p[4]; GLfloat p[4];
p[0] = param; p[0] = param;
p[1] = p[2] = p[3] = 0.0F; p[1] = p[2] = p[3] = 0.0F;
need_update = set_tex_parameterf(ctx, texObj, pname, p, false); need_update = set_tex_parameterf(ctx, texObj, pname, p, dsa);
} }
} }
@@ -982,6 +983,19 @@ _mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params)
} }
} }
void GLAPIENTRY
_mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
{
struct gl_texture_object *texObj;
GET_CURRENT_CONTEXT(ctx);
texObj = get_texobj_by_target(ctx, target, GL_FALSE);
if (!texObj)
return;
_mesa_texture_parameterf(ctx, texObj, pname, param, false);
}
/** /**
* Set tex parameter to integer value(s). Primarily intended to set * Set tex parameter to integer value(s). Primarily intended to set
* integer-valued texture border color (for integer-valued textures). * integer-valued texture border color (for integer-valued textures).
@@ -1039,6 +1053,21 @@ _mesa_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
/* XXX no driver hook for TexParameterIuiv() yet */ /* XXX no driver hook for TexParameterIuiv() yet */
} }
void GLAPIENTRY
_mesa_TextureParameterf(GLuint texture, GLenum pname, GLfloat param)
{
struct gl_texture_object *texObj;
GET_CURRENT_CONTEXT(ctx);
texObj = get_texobj_by_name(ctx, texture, GL_FALSE);
if (!texObj) {
/* User passed a non-generated name. */
_mesa_error(ctx, GL_INVALID_OPERATION, "glTextureParameterf(texture)");
return;
}
_mesa_texture_parameterf(ctx, texObj, pname, param, true);
}
static GLboolean static GLboolean
legal_get_tex_level_parameter_target(struct gl_context *ctx, GLenum target) legal_get_tex_level_parameter_target(struct gl_context *ctx, GLenum target)

View File

@@ -29,6 +29,23 @@
#include "main/glheader.h" #include "main/glheader.h"
/**
* \name Internal functions
*/
/*@{*/
extern void
_mesa_texture_parameterf(struct gl_context *ctx,
struct gl_texture_object *texObj,
GLenum pname, GLfloat param, bool dsa);
/*@}*/
/**
* \name API functions
*/
/*@{*/
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_GetTexLevelParameterfv( GLenum target, GLint level, _mesa_GetTexLevelParameterfv( GLenum target, GLint level,
@@ -72,4 +89,7 @@ extern void GLAPIENTRY
_mesa_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params); _mesa_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params);
extern void GLAPIENTRY
_mesa_TextureParameterf(GLuint texture, GLenum pname, GLfloat param);
#endif /* TEXPARAM_H */ #endif /* TEXPARAM_H */