From 68a0e15f44cf351eab97a734b1cffeade1873fdf Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Fri, 9 Jun 2017 23:27:41 +0200 Subject: mesa: replace VP/FP/ATIfs _Enabled flags with helper functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are only used in the GL compatibility profile. Reviewed-by: Nicolai Hähnle Reviewed-by: Brian Paul Reviewed-by: Timothy Arceri --- src/mesa/main/state.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'src/mesa/main/state.h') diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h index 6d81c3f421b..b719f392965 100644 --- a/src/mesa/main/state.h +++ b/src/mesa/main/state.h @@ -72,12 +72,19 @@ _mesa_need_secondary_color(const struct gl_context *ctx) return GL_FALSE; } +static inline bool +_mesa_arb_vertex_program_enabled(const struct gl_context *ctx) +{ + return ctx->VertexProgram.Enabled && + ctx->VertexProgram.Current->arb.Instructions; +} + /** Compute two sided lighting state for fixed function or programs. */ static inline bool _mesa_vertex_program_two_side_enabled(const struct gl_context *ctx) { if (ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX] || - ctx->VertexProgram._Enabled) + _mesa_arb_vertex_program_enabled(ctx)) return ctx->VertexProgram.TwoSideEnabled; return ctx->Light.Enabled && ctx->Light.Model.TwoSide; @@ -93,4 +100,18 @@ _mesa_polygon_get_front_bit(const struct gl_context *ctx) return ctx->Polygon.FrontFace == GL_CCW; } +static inline bool +_mesa_arb_fragment_program_enabled(const struct gl_context *ctx) +{ + return ctx->FragmentProgram.Enabled && + ctx->FragmentProgram.Current->arb.Instructions; +} + +static inline bool +_mesa_ati_fragment_shader_enabled(const struct gl_context *ctx) +{ + return ctx->ATIFragmentShader.Enabled && + ctx->ATIFragmentShader.Current->Instructions[0]; +} + #endif -- cgit v1.2.3