fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

main: Refactor _mesa_[update|get]_clamp_vertex_color.

Browse source 
Reviewed-by: Fredrik Höglund <fredrik@kde.org>
Signed-off-by: Fredrik Höglund <fredrik@kde.org>
This commit is contained in:
Laura Ekstrand 2015-02-03 11:42:17 -08:00 • committed by Fredrik Höglund
parent 9036a6c0aa
commit c1fe8d841c
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mesa/main/blend.c
View file

@ -769,7 +769,7 @@ _mesa_ClampColor(GLenum target, GLenum clamp)
}
FLUSH_VERTICES(ctx, _NEW_LIGHT);
ctx->Light.ClampVertexColor = clamp;
_mesa_update_clamp_vertex_color(ctx);
_mesa_update_clamp_vertex_color(ctx, ctx->DrawBuffer);
break;
case GL_CLAMP_FRAGMENT_COLOR_ARB:
if (ctx->API == API_OPENGL_CORE &&
@ -814,9 +814,10 @@ _mesa_get_clamp_fragment_color(const struct gl_context *ctx)
}
GLboolean
_mesa_get_clamp_vertex_color(const struct gl_context *ctx)
_mesa_get_clamp_vertex_color(const struct gl_context *ctx,
const struct gl_framebuffer *drawFb)
{
return get_clamp_color(ctx->DrawBuffer, ctx->Light.ClampVertexColor);
return get_clamp_color(drawFb, ctx->Light.ClampVertexColor);
}
GLboolean
@ -848,9 +849,11 @@ _mesa_update_clamp_fragment_color(struct gl_context *ctx)
* Update the ctx->Color._ClampVertexColor field
*/
void
_mesa_update_clamp_vertex_color(struct gl_context *ctx)
_mesa_update_clamp_vertex_color(struct gl_context *ctx,
const struct gl_framebuffer *drawFb)
{
ctx->Light._ClampVertexColor = _mesa_get_clamp_vertex_color(ctx);
ctx->Light._ClampVertexColor =
_mesa_get_clamp_vertex_color(ctx, drawFb);
}
/**

7
src/mesa/main/blend.h
View file

@ -37,6 +37,7 @@
#include "formats.h"
struct gl_context;
struct gl_framebuffer;
extern void GLAPIENTRY
@ -104,7 +105,8 @@ extern GLboolean
_mesa_get_clamp_fragment_color(const struct gl_context *ctx);
extern GLboolean
_mesa_get_clamp_vertex_color(const struct gl_context *ctx);
_mesa_get_clamp_vertex_color(const struct gl_context *ctx,
const struct gl_framebuffer *drawFb);
extern GLboolean
_mesa_get_clamp_read_color(const struct gl_context *ctx);
@ -113,7 +115,8 @@ extern void
_mesa_update_clamp_fragment_color(struct gl_context *ctx);
extern void
_mesa_update_clamp_vertex_color(struct gl_context *ctx);
_mesa_update_clamp_vertex_color(struct gl_context *ctx,
const struct gl_framebuffer *drawFb);
extern mesa_format
_mesa_get_render_format(const struct gl_context *ctx, mesa_format format);

2
src/mesa/main/framebuffer.c
View file

@ -691,7 +691,7 @@ _mesa_update_framebuffer(struct gl_context *ctx,
if (readFb != drawFb)
update_framebuffer(ctx, readFb);
_mesa_update_clamp_vertex_color(ctx);
_mesa_update_clamp_vertex_color(ctx, drawFb);
_mesa_update_clamp_fragment_color(ctx);
}