From: Roland Scheidegger Date: Thu, 28 Jan 2010 16:23:58 +0000 (+0100) Subject: Merge commit 'origin/perrtblend' X-Git-Tag: mesa-7.8~1275 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b346f83a7b672e913a7bb6a089d5dbd7fbdce06;p=platform%2Fupstream%2Fmesa.git Merge commit 'origin/perrtblend' Conflicts: src/gallium/drivers/softpipe/sp_screen.c src/gallium/include/pipe/p_defines.h --- 9b346f83a7b672e913a7bb6a089d5dbd7fbdce06 diff --cc src/gallium/drivers/softpipe/sp_screen.c index 69f40dc,e36f9ec..b2841f4 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@@ -91,10 -91,10 +91,14 @@@ softpipe_get_param(struct pipe_screen * return 1; case PIPE_CAP_BLEND_EQUATION_SEPARATE: return 1; + case PIPE_CAP_MAX_CONST_BUFFERS: + return PIPE_MAX_CONSTANT_BUFFERS; + case PIPE_CAP_MAX_CONST_BUFFER_SIZE: + return 4096 * 4 * sizeof(float); + case PIPE_CAP_INDEP_BLEND_ENABLE: + return 1; + case PIPE_CAP_INDEP_BLEND_FUNC: + return 1; default: return 0; } diff --cc src/gallium/include/pipe/p_defines.h index 353d79a,41a4f20..b28441d --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@@ -405,8 -405,8 +405,10 @@@ enum pipe_transfer_usage #define PIPE_CAP_MAX_PREDICATE_REGISTERS 30 #define PIPE_CAP_MAX_COMBINED_SAMPLERS 31 /*< Maximum texture image units accessible from vertex and fragment shaders combined */ -#define PIPE_CAP_INDEP_BLEND_ENABLE 32 /*< blend enables and write masks per rendertarget */ -#define PIPE_CAP_INDEP_BLEND_FUNC 33 /*< different blend funcs per rendertarget */ +#define PIPE_CAP_MAX_CONST_BUFFERS 32 +#define PIPE_CAP_MAX_CONST_BUFFER_SIZE 33 /*< In bytes */ ++#define PIPE_CAP_INDEP_BLEND_ENABLE 34 /*< blend enables and write masks per rendertarget */ ++#define PIPE_CAP_INDEP_BLEND_FUNC 35 /*< different blend funcs per rendertarget */ /**