Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
---
src/mesa/drivers/dri/nouveau/nouveau_driver.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_fbo.c | 2 +-
src/mesa/main/api_exec.c | 2 +-
src/mesa/main/dlist.c | 6 +++---
src/mesa/main/extensions.c | 2 +-
src/mesa/main/fbobject.c | 6 +++---
src/mesa/main/mfeatures.h | 1 -
src/mesa/state_tracker/st_cb_blit.c | 4 ++--
src/mesa/state_tracker/st_cb_blit.h | 4 ++--
9 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c
b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
index e824d10..465760b 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
@@ -155,7 +155,7 @@ nouveau_driver_functions_init(struct dd_function_table
*functions)
functions->DrawPixels = _mesa_meta_DrawPixels;
functions->CopyPixels = _mesa_meta_CopyPixels;
functions->Bitmap = _mesa_meta_Bitmap;
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
functions->BlitFramebuffer = _mesa_meta_BlitFramebuffer;
#endif
}
diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c
b/src/mesa/drivers/dri/radeon/radeon_fbo.c
index 73456b6..0cf35c0 100644
--- a/src/mesa/drivers/dri/radeon/radeon_fbo.c
+++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c
@@ -954,7 +954,7 @@ void radeon_fbo_init(struct radeon_context *radeon)
radeon->glCtx->Driver.FinishRenderTexture = radeon_finish_render_texture;
radeon->glCtx->Driver.ResizeBuffers = radeon_resize_buffers;
radeon->glCtx->Driver.ValidateFramebuffer = radeon_validate_framebuffer;
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
radeon->glCtx->Driver.BlitFramebuffer = _mesa_meta_BlitFramebuffer;
#endif
radeon->glCtx->Driver.EGLImageTargetRenderbufferStorage =
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 74be12f..618815a 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -748,7 +748,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
SET_GetFramebufferAttachmentParameterivEXT(exec,
_mesa_GetFramebufferAttachmentParameterivEXT);
SET_GenerateMipmapEXT(exec, _mesa_GenerateMipmapEXT);
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
if (ctx->API != API_OPENGLES2) {
SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT);
}
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 08b87ab..92d5e7d 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -6342,7 +6342,7 @@ exec_GetUniformLocationARB(GLuint program, const GLchar
*name)
/* XXX more shader functions needed here */
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
static void GLAPIENTRY
save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
@@ -8482,7 +8482,7 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_DrawBuffersARB(ctx->Exec, (n[1].i, buffers));
}
break;
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
case OPCODE_BLIT_FRAMEBUFFER:
CALL_BlitFramebufferEXT(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i,
n[5].i, n[6].i, n[7].i, n[8].i,
@@ -10455,7 +10455,7 @@ _mesa_create_save_table(void)
SET_DrawBuffersARB(table, save_DrawBuffersARB);
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
SET_BlitFramebufferEXT(table, save_BlitFramebufferEXT);
#endif
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 2317001..2f8c73f 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -453,7 +453,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;
ctx->Extensions.EXT_fog_coord = GL_TRUE;
ctx->Extensions.EXT_framebuffer_object = GL_TRUE;
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
#endif
#if FEATURE_GL
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 4ae1d21..7b19c6d 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1732,7 +1732,7 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint
framebuffer)
}
switch (target) {
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
case GL_DRAW_FRAMEBUFFER_EXT:
if (!ctx->Extensions.EXT_framebuffer_blit) {
_mesa_error(ctx, GL_INVALID_ENUM, "glBindFramebufferEXT(target)");
@@ -2657,7 +2657,7 @@ _mesa_GenerateMipmapEXT(GLenum target)
}
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
static const struct gl_renderbuffer_attachment *
find_attachment(const struct gl_framebuffer *fb,
@@ -3060,7 +3060,7 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint
srcX1, GLint srcY1,
dstX0, dstY0, dstX1, dstY1,
mask, filter);
}
-#endif /* FEATURE_EXT_framebuffer_blit */
+#endif /* FEATURE_GL */
void GLAPIENTRY
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 8835f23..a161021 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,7 +84,6 @@
#define FEATURE_remap_table 0
#endif
-#define FEATURE_EXT_framebuffer_blit FEATURE_GL
#define FEATURE_EXT_texture_sRGB FEATURE_GL
#define FEATURE_EXT_transform_feedback FEATURE_GL
diff --git a/src/mesa/state_tracker/st_cb_blit.c
b/src/mesa/state_tracker/st_cb_blit.c
index 1486779..e0569bf 100644
--- a/src/mesa/state_tracker/st_cb_blit.c
+++ b/src/mesa/state_tracker/st_cb_blit.c
@@ -59,7 +59,7 @@ st_destroy_blit(struct st_context *st)
}
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
static void
st_BlitFramebuffer_resolve(struct gl_context *ctx,
@@ -355,4 +355,4 @@ st_init_blit_functions(struct dd_function_table *functions)
functions->BlitFramebuffer = st_BlitFramebuffer;
}
-#endif /* FEATURE_EXT_framebuffer_blit */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/state_tracker/st_cb_blit.h
b/src/mesa/state_tracker/st_cb_blit.h
index c6d9a36..57274fb 100644
--- a/src/mesa/state_tracker/st_cb_blit.h
+++ b/src/mesa/state_tracker/st_cb_blit.h
@@ -42,7 +42,7 @@ st_init_blit(struct st_context *st);
extern void
st_destroy_blit(struct st_context *st);
-#if FEATURE_EXT_framebuffer_blit
+#if FEATURE_GL
extern void
st_init_blit_functions(struct dd_function_table *functions);
@@ -54,6 +54,6 @@ st_init_blit_functions(struct dd_function_table *functions)
{
}
-#endif /* FEATURE_EXT_framebuffer_blit */
+#endif /* FEATURE_GL */
#endif /* ST_CB_BLIT_H */
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
