OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Force GL_ARB_copy_buffer to always be enabled

Browse Source 
As per discussions at XDS.
This commit is contained in:
Ian Romanick
2010-09-27 14:29:12 -07:00
parent a73c6ce67b
commit 4da5f1b7c5
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/dri/common/utils.c
View File

@@ -140,6 +140,7 @@ driGetRendererString( char * buffer, const char * hardware_name,
#define need_GL_ARB_copy_buffer
#define need_GL_ARB_draw_buffers #define need_GL_ARB_draw_buffers
#define need_GL_ARB_multisample #define need_GL_ARB_multisample
#define need_GL_ARB_texture_compression #define need_GL_ARB_texture_compression
@@ -164,6 +165,7 @@ driGetRendererString( char * buffer, const char * hardware_name,
#include "main/remap_helper.h" #include "main/remap_helper.h"
static const struct dri_extension all_mesa_extensions[] = { static const struct dri_extension all_mesa_extensions[] = {
{ "GL_ARB_copy_buffer", GL_ARB_copy_buffer_functions },
{ "GL_ARB_draw_buffers", GL_ARB_draw_buffers_functions }, { "GL_ARB_draw_buffers", GL_ARB_draw_buffers_functions },
{ "GL_ARB_multisample", GL_ARB_multisample_functions }, { "GL_ARB_multisample", GL_ARB_multisample_functions },
{ "GL_ARB_texture_compression", GL_ARB_texture_compression_functions }, { "GL_ARB_texture_compression", GL_ARB_texture_compression_functions },

2
src/mesa/drivers/dri/intel/intel_extensions.c
View File

@@ -31,7 +31,6 @@
#include "utils.h" #include "utils.h"
#define need_GL_ARB_copy_buffer
#define need_GL_ARB_draw_elements_base_vertex #define need_GL_ARB_draw_elements_base_vertex
#define need_GL_ARB_framebuffer_object #define need_GL_ARB_framebuffer_object
#define need_GL_ARB_map_buffer_range #define need_GL_ARB_map_buffer_range
@@ -79,7 +78,6 @@
* i965_dri. * i965_dri.
*/ */
static const struct dri_extension card_extensions[] = { static const struct dri_extension card_extensions[] = {
{ "GL_ARB_copy_buffer", GL_ARB_copy_buffer_functions },
{ "GL_ARB_draw_elements_base_vertex", GL_ARB_draw_elements_base_vertex_functions }, { "GL_ARB_draw_elements_base_vertex", GL_ARB_draw_elements_base_vertex_functions },
{ "GL_ARB_half_float_pixel", NULL }, { "GL_ARB_half_float_pixel", NULL },
{ "GL_ARB_map_buffer_range", GL_ARB_map_buffer_range_functions }, { "GL_ARB_map_buffer_range", GL_ARB_map_buffer_range_functions },

10
src/mesa/main/bufferobj.c
View File

@@ -74,15 +74,9 @@ get_buffer_target(GLcontext *ctx, GLenum target)
case GL_PIXEL_UNPACK_BUFFER_EXT: case GL_PIXEL_UNPACK_BUFFER_EXT:
return &ctx->Unpack.BufferObj; return &ctx->Unpack.BufferObj;
case GL_COPY_READ_BUFFER: case GL_COPY_READ_BUFFER:
if (ctx->Extensions.ARB_copy_buffer) { return &ctx->CopyReadBuffer;
return &ctx->CopyReadBuffer;
}
break;
case GL_COPY_WRITE_BUFFER: case GL_COPY_WRITE_BUFFER:
if (ctx->Extensions.ARB_copy_buffer) { return &ctx->CopyWriteBuffer;
return &ctx->CopyWriteBuffer;
}
break;
#if FEATURE_EXT_transform_feedback #if FEATURE_EXT_transform_feedback
case GL_TRANSFORM_FEEDBACK_BUFFER: case GL_TRANSFORM_FEEDBACK_BUFFER:
if (ctx->Extensions.EXT_transform_feedback) { if (ctx->Extensions.EXT_transform_feedback) {

4
src/mesa/main/extensions.c
View File

@@ -45,7 +45,7 @@ static const struct {
int flag_offset; int flag_offset;
} default_extensions[] = { } default_extensions[] = {
{ OFF, "GL_ARB_blend_func_extended", F(ARB_blend_func_extended) }, { OFF, "GL_ARB_blend_func_extended", F(ARB_blend_func_extended) },
{ OFF, "GL_ARB_copy_buffer", F(ARB_copy_buffer) }, { ON, "GL_ARB_copy_buffer", F(ARB_copy_buffer) },
{ OFF, "GL_ARB_depth_buffer_float", F(ARB_depth_buffer_float) }, { OFF, "GL_ARB_depth_buffer_float", F(ARB_depth_buffer_float) },
{ OFF, "GL_ARB_depth_clamp", F(ARB_depth_clamp) }, { OFF, "GL_ARB_depth_clamp", F(ARB_depth_clamp) },
{ OFF, "GL_ARB_depth_texture", F(ARB_depth_texture) }, { OFF, "GL_ARB_depth_texture", F(ARB_depth_texture) },
@@ -229,7 +229,7 @@ static const struct {
void void
_mesa_enable_sw_extensions(GLcontext *ctx) _mesa_enable_sw_extensions(GLcontext *ctx)
{ {
ctx->Extensions.ARB_copy_buffer = GL_TRUE; /*ctx->Extensions.ARB_copy_buffer = GL_TRUE;*/
ctx->Extensions.ARB_depth_clamp = GL_TRUE; ctx->Extensions.ARB_depth_clamp = GL_TRUE;
ctx->Extensions.ARB_depth_texture = GL_TRUE; ctx->Extensions.ARB_depth_texture = GL_TRUE;
/*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/ /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/