diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/api_exec.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/dlist.c | 7 | ||||
| -rw-r--r-- | src/mesa/main/extensions.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.c | 9 | ||||
| -rw-r--r-- | src/mesa/main/mfeatures.h | 1 |
5 files changed, 0 insertions, 21 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index 76028ad49a3..2f3d1d1b2f1 100644 --- a/src/mesa/main/api_exec.c +++ b/src/mesa/main/api_exec.c @@ -730,11 +730,9 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_GetFramebufferAttachmentParameterivEXT(exec, _mesa_GetFramebufferAttachmentParameterivEXT); SET_GenerateMipmapEXT(exec, _mesa_GenerateMipmapEXT); -#if FEATURE_EXT_framebuffer_blit if (ctx->API != API_OPENGLES2) { SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT); } -#endif /* GL_EXT_gpu_program_parameters */ if (ctx->API == API_OPENGL) { diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index f6fcd309946..fdc70b5adb9 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -6323,7 +6323,6 @@ exec_GetUniformLocationARB(GLuint program, const GLchar *name) /* XXX more shader functions needed here */ -#if FEATURE_EXT_framebuffer_blit static void GLAPIENTRY save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, @@ -6351,7 +6350,6 @@ save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, mask, filter)); } } -#endif /** GL_EXT_provoking_vertex */ @@ -8455,14 +8453,11 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_DrawBuffersARB(ctx->Exec, (n[1].i, buffers)); } break; -#if FEATURE_EXT_framebuffer_blit 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, n[9].i, n[10].e)); break; -#endif - case OPCODE_USE_PROGRAM: CALL_UseProgramObjectARB(ctx->Exec, (n[1].ui)); break; @@ -10422,9 +10417,7 @@ _mesa_create_save_table(void) SET_DrawBuffersARB(table, save_DrawBuffersARB); -#if FEATURE_EXT_framebuffer_blit SET_BlitFramebufferEXT(table, save_BlitFramebufferEXT); -#endif /* GL_ARB_shader_objects */ _mesa_init_shader_dispatch(table); /* Plug in glCreate/Delete/Get, etc */ diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 751c0f2d9cb..3dcd0c8113c 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -445,9 +445,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 ctx->Extensions.EXT_framebuffer_blit = GL_TRUE; -#endif ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE; ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE; ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE; diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 9730b77bf6a..1736899cba1 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -819,7 +819,6 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, } } -#if FEATURE_GL if (_mesa_is_desktop_gl(ctx) && !ctx->Extensions.ARB_ES2_compatibility) { /* Check that all DrawBuffers are present */ for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) { @@ -847,9 +846,6 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, } } } -#else - (void) j; -#endif if (numImages == 0) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT; @@ -1732,7 +1728,6 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer) } switch (target) { -#if FEATURE_EXT_framebuffer_blit case GL_DRAW_FRAMEBUFFER_EXT: if (!ctx->Extensions.EXT_framebuffer_blit) { _mesa_error(ctx, GL_INVALID_ENUM, "glBindFramebufferEXT(target)"); @@ -1749,7 +1744,6 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer) bindDrawBuf = GL_FALSE; bindReadBuf = GL_TRUE; break; -#endif case GL_FRAMEBUFFER_EXT: bindDrawBuf = GL_TRUE; bindReadBuf = GL_TRUE; @@ -2657,8 +2651,6 @@ _mesa_GenerateMipmapEXT(GLenum target) } -#if FEATURE_EXT_framebuffer_blit - static const struct gl_renderbuffer_attachment * find_attachment(const struct gl_framebuffer *fb, const struct gl_renderbuffer *rb) @@ -3060,7 +3052,6 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } -#endif /* FEATURE_EXT_framebuffer_blit */ void GLAPIENTRY diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 8835f2366ad..a1610211e70 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 |