gallium: Define PIPE_CAP_BLEND_EQUATION_SEPARATE, remove extension from default extension list
This commit is contained in:
parent
33f56b4612
commit
54cf63278f
|
@ -42,6 +42,8 @@ nv04_screen_get_param(struct pipe_screen *screen, int param)
|
||||||
return 1;
|
return 1;
|
||||||
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
||||||
return 0;
|
return 0;
|
||||||
|
case PIPE_CAP_BLEND_EQUATION_SEPARATE:
|
||||||
|
return 0;
|
||||||
case NOUVEAU_CAP_HW_VTXBUF:
|
case NOUVEAU_CAP_HW_VTXBUF:
|
||||||
case NOUVEAU_CAP_HW_IDXBUF:
|
case NOUVEAU_CAP_HW_IDXBUF:
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -37,6 +37,8 @@ nv10_screen_get_param(struct pipe_screen *screen, int param)
|
||||||
return 0;
|
return 0;
|
||||||
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
||||||
return 0;
|
return 0;
|
||||||
|
case PIPE_CAP_BLEND_EQUATION_SEPARATE:
|
||||||
|
return 0;
|
||||||
case NOUVEAU_CAP_HW_VTXBUF:
|
case NOUVEAU_CAP_HW_VTXBUF:
|
||||||
case NOUVEAU_CAP_HW_IDXBUF:
|
case NOUVEAU_CAP_HW_IDXBUF:
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -37,6 +37,8 @@ nv20_screen_get_param(struct pipe_screen *screen, int param)
|
||||||
return 0;
|
return 0;
|
||||||
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
||||||
return 0;
|
return 0;
|
||||||
|
case PIPE_CAP_BLEND_EQUATION_SEPARATE:
|
||||||
|
return 0;
|
||||||
case NOUVEAU_CAP_HW_VTXBUF:
|
case NOUVEAU_CAP_HW_VTXBUF:
|
||||||
case NOUVEAU_CAP_HW_IDXBUF:
|
case NOUVEAU_CAP_HW_IDXBUF:
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -48,6 +48,8 @@ nv30_screen_get_param(struct pipe_screen *pscreen, int param)
|
||||||
return 0;
|
return 0;
|
||||||
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
||||||
return 0;
|
return 0;
|
||||||
|
case PIPE_CAP_BLEND_EQUATION_SEPARATE:
|
||||||
|
return 0;
|
||||||
case NOUVEAU_CAP_HW_VTXBUF:
|
case NOUVEAU_CAP_HW_VTXBUF:
|
||||||
case NOUVEAU_CAP_HW_IDXBUF:
|
case NOUVEAU_CAP_HW_IDXBUF:
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -46,6 +46,8 @@ nv40_screen_get_param(struct pipe_screen *pscreen, int param)
|
||||||
return 0; /* We have 4 - but unsupported currently */
|
return 0; /* We have 4 - but unsupported currently */
|
||||||
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
||||||
return 0;
|
return 0;
|
||||||
|
case PIPE_CAP_BLEND_EQUATION_SEPARATE:
|
||||||
|
return 1;
|
||||||
case NOUVEAU_CAP_HW_VTXBUF:
|
case NOUVEAU_CAP_HW_VTXBUF:
|
||||||
return 1;
|
return 1;
|
||||||
case NOUVEAU_CAP_HW_IDXBUF:
|
case NOUVEAU_CAP_HW_IDXBUF:
|
||||||
|
|
|
@ -111,6 +111,8 @@ nv50_screen_get_param(struct pipe_screen *pscreen, int param)
|
||||||
return 0;
|
return 0;
|
||||||
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
||||||
return 0;
|
return 0;
|
||||||
|
case PIPE_CAP_BLEND_EQUATION_SEPARATE:
|
||||||
|
return 1;
|
||||||
case NOUVEAU_CAP_HW_VTXBUF:
|
case NOUVEAU_CAP_HW_VTXBUF:
|
||||||
return 1;
|
return 1;
|
||||||
case NOUVEAU_CAP_HW_IDXBUF:
|
case NOUVEAU_CAP_HW_IDXBUF:
|
||||||
|
|
|
@ -89,6 +89,8 @@ softpipe_get_param(struct pipe_screen *screen, int param)
|
||||||
return 13; /* max 4Kx4K */
|
return 13; /* max 4Kx4K */
|
||||||
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
case PIPE_CAP_TGSI_CONT_SUPPORTED:
|
||||||
return 1;
|
return 1;
|
||||||
|
case PIPE_CAP_BLEND_EQUATION_SEPARATE:
|
||||||
|
return 1;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -304,6 +304,7 @@ enum pipe_transfer_usage {
|
||||||
#define PIPE_CAP_TEXTURE_MIRROR_REPEAT 25
|
#define PIPE_CAP_TEXTURE_MIRROR_REPEAT 25
|
||||||
#define PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS 26
|
#define PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS 26
|
||||||
#define PIPE_CAP_TGSI_CONT_SUPPORTED 27
|
#define PIPE_CAP_TGSI_CONT_SUPPORTED 27
|
||||||
|
#define PIPE_CAP_BLEND_EQUATION_SEPARATE 28
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -82,8 +82,6 @@ const struct dri_extension card_extensions[] = {
|
||||||
{"GL_ARB_vertex_program", GL_ARB_vertex_program_functions},
|
{"GL_ARB_vertex_program", GL_ARB_vertex_program_functions},
|
||||||
{"GL_ARB_window_pos", GL_ARB_window_pos_functions},
|
{"GL_ARB_window_pos", GL_ARB_window_pos_functions},
|
||||||
{"GL_EXT_blend_color", GL_EXT_blend_color_functions},
|
{"GL_EXT_blend_color", GL_EXT_blend_color_functions},
|
||||||
{"GL_EXT_blend_equation_separate",
|
|
||||||
GL_EXT_blend_equation_separate_functions},
|
|
||||||
{"GL_EXT_blend_func_separate", GL_EXT_blend_func_separate_functions},
|
{"GL_EXT_blend_func_separate", GL_EXT_blend_func_separate_functions},
|
||||||
{"GL_EXT_blend_minmax", GL_EXT_blend_minmax_functions},
|
{"GL_EXT_blend_minmax", GL_EXT_blend_minmax_functions},
|
||||||
{"GL_EXT_blend_subtract", NULL},
|
{"GL_EXT_blend_subtract", NULL},
|
||||||
|
|
|
@ -158,7 +158,6 @@ void st_init_extensions(struct st_context *st)
|
||||||
ctx->Extensions.ARB_vertex_program = GL_TRUE;
|
ctx->Extensions.ARB_vertex_program = GL_TRUE;
|
||||||
|
|
||||||
ctx->Extensions.EXT_blend_color = GL_TRUE;
|
ctx->Extensions.EXT_blend_color = GL_TRUE;
|
||||||
ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
|
|
||||||
ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
|
ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
|
||||||
ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
|
ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
|
||||||
ctx->Extensions.EXT_blend_minmax = GL_TRUE;
|
ctx->Extensions.EXT_blend_minmax = GL_TRUE;
|
||||||
|
@ -206,6 +205,10 @@ void st_init_extensions(struct st_context *st)
|
||||||
ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
|
ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (screen->get_param(screen, PIPE_CAP_BLEND_EQUATION_SEPARATE)) {
|
||||||
|
ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
if (screen->get_param(screen, PIPE_CAP_TEXTURE_MIRROR_CLAMP) > 0) {
|
if (screen->get_param(screen, PIPE_CAP_TEXTURE_MIRROR_CLAMP) > 0) {
|
||||||
ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;
|
ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue