From: Brian Paul <brianp@vmware.com>
Date: Wed, 10 Apr 2013 00:43:40 +0000 (-0600)
Subject: st/mesa: remove #if FEATURE_GL/ES tests
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b74b510d64bc33ef36cbc02952611f847ac7f123;p=mesa.git

st/mesa: remove #if FEATURE_GL/ES tests

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
---

diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index 03e086a72cd..ff52aa1f9b5 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -28,7 +28,6 @@
 
 #include "main/mtypes.h"
 #include "main/context.h"
-#include "main/mfeatures.h"
 #include "main/texobj.h"
 #include "main/teximage.h"
 #include "main/texstate.h"
@@ -884,16 +883,10 @@ st_manager_add_color_renderbuffer(struct st_context *st,
 static const struct st_api st_gl_api = {
    "Mesa " PACKAGE_VERSION,
    ST_API_OPENGL,
-#if FEATURE_GL
    ST_PROFILE_DEFAULT_MASK |
    ST_PROFILE_OPENGL_CORE_MASK |
-#endif
-#if FEATURE_ES1
    ST_PROFILE_OPENGL_ES1_MASK |
-#endif
-#if FEATURE_ES2
    ST_PROFILE_OPENGL_ES2_MASK |
-#endif
    0,
    ST_API_FEATURE_MS_VISUALS_MASK,
    st_api_destroy,