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

meta: Fix compilation without FEATURE_feedback

Browse source 
That is when building with --disable-opengl.
Fix for commit c5f4024a79.

CC: Chad Versace <chad@chad-versace.us>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Benjamin Franzke 2012-02-29 16:36:21 +01:00
parent e6aa32ac7f
commit 84f107d287
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/common/meta.c
View file

@ -174,10 +174,12 @@ struct save_state
struct gl_query_object *CondRenderQuery;
GLenum CondRenderMode;
#if FEATURE_feedback
/** MESA_META_SELECT_FEEDBACK */
GLenum RenderMode;
struct gl_selection Select;
struct gl_feedback Feedback;
#endif
/** Miscellaneous (always disabled) */
GLboolean Lighting;
@ -700,6 +702,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_EndConditionalRender();
}
#if FEATURE_feedback
if (state & MESA_META_SELECT_FEEDBACK) {
save->RenderMode = ctx->RenderMode;
if (ctx->RenderMode == GL_SELECT) {
@ -710,6 +713,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_RenderMode(GL_RENDER);
}
}
#endif
/* misc */
{
@ -984,6 +988,7 @@ _mesa_meta_end(struct gl_context *ctx)
save->CondRenderMode);
}
#if FEATURE_feedback
if (state & MESA_META_SELECT_FEEDBACK) {
if (save->RenderMode == GL_SELECT) {
_mesa_RenderMode(GL_SELECT);
@ -993,6 +998,7 @@ _mesa_meta_end(struct gl_context *ctx)
ctx->Feedback = save->Feedback;
}
}
#endif
/* misc */
if (save->Lighting) {