Re: [Mesa-dev] [PATCH 1/4] meta: Fix compilation without FEATURE_feedback
On 02/29/2012 07:36 AM, Benjamin Franzke wrote: That is when building with --disable-opengl. Fix for commit c5f4024a793f1209b1693aed9a46be9374ba4741. CC: Chad Versace c...@chad-versace.us --- src/mesa/drivers/common/meta.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) For patches 1-2, Reviewed-by: Chad Versace chad.vers...@linux.intel.com I'm leaving patch 4 for someone who understands it better. I've replied to patch 3 with a question. -- Chad Versace c...@chad-versace.us ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/4] meta: Fix compilation without FEATURE_feedback
On 02/29/2012 07:36 AM, Benjamin Franzke wrote: That is when building with --disable-opengl. Fix for commit c5f4024a793f1209b1693aed9a46be9374ba4741. CC: Chad Versace c...@chad-versace.us --- src/mesa/drivers/common/meta.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) For patches 1-2, Reviewed-by: Chad Versace chad.vers...@linux.intel.com I'm leaving patch 4 for someone who understands it better. I've replied to patch 3 with a question. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/4] meta: Fix compilation without FEATURE_feedback
That is when building with --disable-opengl.
Fix for commit c5f4024a793f1209b1693aed9a46be9374ba4741.
CC: Chad Versace c...@chad-versace.us
---
src/mesa/drivers/common/meta.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 6c8495d..f7fa7b9 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -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) {
--
1.7.3.4
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/4] meta: Fix compilation without FEATURE_feedback
On 02/29/2012 08:36 AM, Benjamin Franzke wrote: That is when building with --disable-opengl. Fix for commit c5f4024a793f1209b1693aed9a46be9374ba4741. CC: Chad Versacec...@chad-versace.us --- src/mesa/drivers/common/meta.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) For 12: Reviewed-by: Brian Paul bri...@vmware.com I'll leave 34 to others. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
