mesa.git
11 years agomesa/es: Define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT enum for all GLs
Tomeu Vizoso [Tue, 11 Sep 2012 09:14:26 +0000 (11:14 +0200)]
mesa/es: Define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT enum for all GLs

instead of just for GL and ES1.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: fix dropped && in glGetStringi()
Chris Forbes [Sun, 16 Sep 2012 07:54:11 +0000 (19:54 +1200)]
mesa: fix dropped && in glGetStringi()

This fixes glGetStringi(GL_EXTENSIONS,.. for core contexts. Previously,
all extension names returned would be NULL.

NOTE: This is a candidate for release branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agometa: Don't _mesa_set_enable() invalid targets in ES 1.
Kenneth Graunke [Fri, 14 Sep 2012 09:39:52 +0000 (02:39 -0700)]
meta: Don't _mesa_set_enable() invalid targets in ES 1.

GL_TEXTURE_1D, GL_TEXTURE_3D, GL_TEXTURE_RECTANGLE, and
GL_TEXTURE_GEN_S/T/R/Q don't exist in ES 1 contexts, so any meta ops
that used _mesa_meta_begin with MESA_META_TEXTURE would trigger GL
errors.  One such operation is _mesa_meta_Clear().

On ES 1, we want to disable GL_TEXTURE_GEN_STR_OES instead.

Fixes the ES1 conformance test miplin.c, which was regressed by commit
08be1d288f216232d3974f5997b266a8dd720928.

NOTE: This is a candidate for the 9.0 branch.

v2: Also blacklist GL_TEXTURE_3D, per Brian's comment.
v3: Disable GL_TEXTURE_GEN_STR_OES, per Ian's comment.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54297
Reviewed-by: Brian Paul <brianp@vmware.com> [v1]
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoTemporarily revert "mesa: remove remaining FEATURE_* defines where protected by API...
José Fonseca [Sat, 15 Sep 2012 17:15:22 +0000 (18:15 +0100)]
Temporarily revert "mesa: remove remaining FEATURE_* defines where protected by API check."

This reverts commit 9f37b405a3de8668a5f74c9681829688475ac3b7.

Fixes windows builds.

11 years agoscons: add new -p (prefix) options for yacc
Brian Paul [Sat, 15 Sep 2012 15:01:02 +0000 (09:01 -0600)]
scons: add new -p (prefix) options for yacc

These were recently added to the Makefiles.

11 years agoswrast: remove unused ati_fs_opcodes array
Brian Paul [Sat, 15 Sep 2012 14:29:47 +0000 (08:29 -0600)]
swrast: remove unused ati_fs_opcodes array

11 years agomesa: remove FEATURE_ES test in texcompress_cpal.c
Brian Paul [Sat, 15 Sep 2012 14:28:16 +0000 (08:28 -0600)]
mesa: remove FEATURE_ES test in texcompress_cpal.c

Fixes a regression after removing the #if FEATURE_x tests.

11 years agomesa: remove never-defined FEATURE_histogram conditional.
Oliver McFadden [Thu, 13 Sep 2012 07:53:29 +0000 (10:53 +0300)]
mesa: remove never-defined FEATURE_histogram conditional.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove remaining FEATURE_* defines where protected by API check.
Oliver McFadden [Thu, 13 Sep 2012 07:44:09 +0000 (10:44 +0300)]
mesa: remove remaining FEATURE_* defines where protected by API check.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove obsolete comments from mfeatures.h
Oliver McFadden [Tue, 11 Sep 2012 08:16:59 +0000 (11:16 +0300)]
mesa: remove obsolete comments from mfeatures.h

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_ATI_fragment_shader define.
Oliver McFadden [Tue, 11 Sep 2012 08:15:14 +0000 (11:15 +0300)]
mesa: remove FEATURE_ATI_fragment_shader define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_APPLE_object_purgeable define.
Oliver McFadden [Tue, 11 Sep 2012 08:14:11 +0000 (11:14 +0300)]
mesa: remove FEATURE_APPLE_object_purgeable define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_EXT_transform_feedback define.
Oliver McFadden [Tue, 11 Sep 2012 08:13:07 +0000 (11:13 +0300)]
mesa: remove FEATURE_EXT_transform_feedback define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_EXT_texture_sRGB define.
Oliver McFadden [Tue, 11 Sep 2012 08:11:56 +0000 (11:11 +0300)]
mesa: remove FEATURE_EXT_texture_sRGB define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_EXT_framebuffer_blit define.
Oliver McFadden [Tue, 11 Sep 2012 08:10:55 +0000 (11:10 +0300)]
mesa: remove FEATURE_EXT_framebuffer_blit define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_ARB_sync define.
Oliver McFadden [Tue, 11 Sep 2012 08:09:35 +0000 (11:09 +0300)]
mesa: remove FEATURE_ARB_sync define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_ARB_sampler_objects define.
Oliver McFadden [Tue, 11 Sep 2012 08:08:21 +0000 (11:08 +0300)]
mesa: remove FEATURE_ARB_sampler_objects define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_ARB_pixel_buffer_object define.
Oliver McFadden [Tue, 11 Sep 2012 08:07:11 +0000 (11:07 +0300)]
mesa: remove FEATURE_ARB_pixel_buffer_object define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_ARB_map_buffer_range define.
Oliver McFadden [Tue, 11 Sep 2012 08:05:05 +0000 (11:05 +0300)]
mesa: remove FEATURE_ARB_map_buffer_range define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_ARB_framebuffer_object define.
Oliver McFadden [Tue, 11 Sep 2012 08:02:27 +0000 (11:02 +0300)]
mesa: remove FEATURE_ARB_framebuffer_object define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_ARB_(fragment|vertex)_program defines.
Oliver McFadden [Tue, 11 Sep 2012 07:56:33 +0000 (10:56 +0300)]
mesa: remove FEATURE_ARB_(fragment|vertex)_program defines.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_NV_(fragment|vertex)_program defines.
Oliver McFadden [Tue, 11 Sep 2012 07:41:46 +0000 (10:41 +0300)]
mesa: remove FEATURE_NV_(fragment|vertex)_program defines.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove unused FEATURE_NV_fence define.
Oliver McFadden [Tue, 11 Sep 2012 07:25:30 +0000 (10:25 +0300)]
mesa: remove unused FEATURE_NV_fence define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove unused FEATURE_OES_framebuffer_object define.
Oliver McFadden [Tue, 11 Sep 2012 07:24:58 +0000 (10:24 +0300)]
mesa: remove unused FEATURE_OES_framebuffer_object define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove unused FEATURE_OES_mapbuffer define.
Oliver McFadden [Tue, 11 Sep 2012 07:24:40 +0000 (10:24 +0300)]
mesa: remove unused FEATURE_OES_mapbuffer define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_OES_EGL_image define.
Oliver McFadden [Tue, 11 Sep 2012 07:23:20 +0000 (10:23 +0300)]
mesa: remove FEATURE_OES_EGL_image define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_EXT_pixel_buffer_object define.
Oliver McFadden [Tue, 11 Sep 2012 07:18:21 +0000 (10:18 +0300)]
mesa: remove FEATURE_EXT_pixel_buffer_object define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_EXT_framebuffer_object define.
Oliver McFadden [Tue, 11 Sep 2012 07:17:07 +0000 (10:17 +0300)]
mesa: remove FEATURE_EXT_framebuffer_object define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_ARB_shader_objects and related defines.
Oliver McFadden [Tue, 11 Sep 2012 07:09:18 +0000 (10:09 +0300)]
mesa: remove FEATURE_ARB_shader_objects and related defines.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_ARB_fragment_shader define.
Oliver McFadden [Tue, 11 Sep 2012 06:55:24 +0000 (09:55 +0300)]
mesa: remove FEATURE_ARB_fragment_shader define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_ARB_vertex_shader define.
Oliver McFadden [Tue, 11 Sep 2012 06:54:00 +0000 (09:54 +0300)]
mesa: remove FEATURE_ARB_vertex_shader define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_OES_draw_texture define.
Oliver McFadden [Tue, 11 Sep 2012 06:49:44 +0000 (09:49 +0300)]
mesa: remove FEATURE_OES_draw_texture define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_es2_glsl and related defines.
Oliver McFadden [Tue, 11 Sep 2012 06:43:08 +0000 (09:43 +0300)]
mesa: remove FEATURE_es2_glsl and related defines.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_point_size_array define.
Oliver McFadden [Tue, 11 Sep 2012 06:41:59 +0000 (09:41 +0300)]
mesa: remove FEATURE_point_size_array define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove unused FEATURE_extra_context_init define.
Oliver McFadden [Tue, 11 Sep 2012 06:40:36 +0000 (09:40 +0300)]
mesa: remove unused FEATURE_extra_context_init define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_texture_s3tc define.
Oliver McFadden [Tue, 11 Sep 2012 06:39:12 +0000 (09:39 +0300)]
mesa: remove FEATURE_texture_s3tc define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_texture_fxt1 define.
Oliver McFadden [Tue, 11 Sep 2012 06:38:11 +0000 (09:38 +0300)]
mesa: remove FEATURE_texture_fxt1 define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_rastpos define.
Oliver McFadden [Tue, 11 Sep 2012 06:21:38 +0000 (09:21 +0300)]
mesa: remove FEATURE_rastpos define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_queryobj define.
Oliver McFadden [Tue, 11 Sep 2012 06:19:19 +0000 (09:19 +0300)]
mesa: remove FEATURE_queryobj define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_pixel_transfer define.
Oliver McFadden [Tue, 11 Sep 2012 06:17:44 +0000 (09:17 +0300)]
mesa: remove FEATURE_pixel_transfer define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_feedback define.
Oliver McFadden [Tue, 11 Sep 2012 06:16:33 +0000 (09:16 +0300)]
mesa: remove FEATURE_feedback define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_evaluators define.
Oliver McFadden [Tue, 11 Sep 2012 06:15:32 +0000 (09:15 +0300)]
mesa: remove FEATURE_evaluators define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_drawpix define.
Oliver McFadden [Tue, 11 Sep 2012 06:14:31 +0000 (09:14 +0300)]
mesa: remove FEATURE_drawpix define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_draw_read_buffer define.
Oliver McFadden [Tue, 11 Sep 2012 06:11:55 +0000 (09:11 +0300)]
mesa: remove FEATURE_draw_read_buffer define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_dlist define.
Oliver McFadden [Tue, 11 Sep 2012 06:10:34 +0000 (09:10 +0300)]
mesa: remove FEATURE_dlist define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_convolve define.
Oliver McFadden [Tue, 11 Sep 2012 06:08:56 +0000 (09:08 +0300)]
mesa: remove FEATURE_convolve define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_colortable define.
Oliver McFadden [Tue, 11 Sep 2012 06:08:15 +0000 (09:08 +0300)]
mesa: remove FEATURE_colortable define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_beginend define.
Oliver McFadden [Tue, 11 Sep 2012 06:06:56 +0000 (09:06 +0300)]
mesa: remove FEATURE_beginend define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_attrib_stack define.
Oliver McFadden [Tue, 11 Sep 2012 06:05:06 +0000 (09:05 +0300)]
mesa: remove FEATURE_attrib_stack define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_arrayelt define.
Oliver McFadden [Tue, 11 Sep 2012 06:04:02 +0000 (09:04 +0300)]
mesa: remove FEATURE_arrayelt define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_accum define.
Oliver McFadden [Tue, 11 Sep 2012 06:02:42 +0000 (09:02 +0300)]
mesa: remove FEATURE_accum define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_userclip define.
Oliver McFadden [Tue, 11 Sep 2012 06:00:23 +0000 (09:00 +0300)]
mesa: remove FEATURE_userclip define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_texgen define.
Oliver McFadden [Tue, 11 Sep 2012 05:59:27 +0000 (08:59 +0300)]
mesa: remove FEATURE_texgen define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: remove FEATURE_dispatch define.
Oliver McFadden [Tue, 11 Sep 2012 05:58:24 +0000 (08:58 +0300)]
mesa: remove FEATURE_dispatch define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agovbo: add a prefix to count_tessellated_primitives
Dave Airlie [Sat, 15 Sep 2012 03:22:30 +0000 (13:22 +1000)]
vbo: add a prefix to count_tessellated_primitives

Just to make it consistent with the rest of vbo, since it would
be an exported symbol anyways.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agomesa/fxt1: make fxt1_decode_1 static
Dave Airlie [Sat, 15 Sep 2012 03:16:47 +0000 (13:16 +1000)]
mesa/fxt1: make fxt1_decode_1 static

No users outside this file.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agomesa/ati_fragshader: no need for opcodes to be global.
Dave Airlie [Sat, 15 Sep 2012 03:14:27 +0000 (13:14 +1000)]
mesa/ati_fragshader: no need for opcodes to be global.

I can't see these in use anywhere outside this file.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agoglsl: make tex_opcode_strs static
Dave Airlie [Sat, 15 Sep 2012 03:14:02 +0000 (13:14 +1000)]
glsl: make tex_opcode_strs static

No reason for this to be global from what I can see

Reviewed-by: Matt Turner <mattst88@gmail.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agomesa/dxtn: make function pointers static
Dave Airlie [Sat, 15 Sep 2012 03:09:42 +0000 (13:09 +1000)]
mesa/dxtn: make function pointers static

These aren't used outside thie file from what I can see.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agometa: make mem_ctx non-global.
Dave Airlie [Sat, 15 Sep 2012 03:09:05 +0000 (13:09 +1000)]
meta: make mem_ctx non-global.

I can't see any external users, and this is a global symbol,

Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agoglsl: make builtin_mem_ctx a static
Dave Airlie [Sat, 15 Sep 2012 03:02:51 +0000 (13:02 +1000)]
glsl: make builtin_mem_ctx a static

This isn't used outside the generated file.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agoir_to_mesa: make some global variable static
Dave Airlie [Sat, 15 Sep 2012 03:00:35 +0000 (13:00 +1000)]
ir_to_mesa: make some global variable static

nothing outside this file uses these.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agomesa: make global perm variable static const
Dave Airlie [Sat, 15 Sep 2012 02:55:49 +0000 (12:55 +1000)]
mesa: make global perm variable static const

this array doesn't look like it needs to be global or unconst.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agomklib: clean up abi flags for x86 targets
Mike Frysinger [Tue, 11 Sep 2012 05:57:25 +0000 (01:57 -0400)]
mklib: clean up abi flags for x86 targets

The current code is duplicated in two places and relies on `uname` to
detect the flags.  This is no good for cross-compiling, and the current
logic uses -m64 for the x32 ABI which breaks things.

Unify the code in one place, avoid `uname` completely, and add support
for the new x32 ABI.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
11 years agomesa/glsl: rename preprocess to glcpp_preprocess
Dave Airlie [Fri, 14 Sep 2012 00:13:01 +0000 (10:13 +1000)]
mesa/glsl: rename preprocess to glcpp_preprocess

This symbol with dricore escapes into the namespace, its too generic,
we should prefix it with something just to be nice.

Should be applied to stable + 9.0

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agoglcpp: fix abuse of yylex
Dave Airlie [Fri, 14 Sep 2012 09:59:54 +0000 (19:59 +1000)]
glcpp: fix abuse of yylex

So glcpp tried to workaround yylex its own way, but failed,
do it properly.

This fixes another crash found after fixing the first crash.

this is a candidate for 9.0 and stable branches

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agomesa: use a prefix for the program lex
Dave Airlie [Fri, 14 Sep 2012 00:05:53 +0000 (10:05 +1000)]
mesa: use a prefix for the program lex

This avoids us making a global yylex symbol which will interfere will
all sorts of apps.

with libdricore which can't do symbol visibility currently we pollute
the namespace with this.

This is a candidate for 9.0 & stable branches.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agometa: Refactor handling of GL_MULTISAMPLE.
Paul Berry [Thu, 13 Sep 2012 17:20:07 +0000 (10:20 -0700)]
meta: Refactor handling of GL_MULTISAMPLE.

In commit 055093e (meta: remove call to _meta_in_progress(), fix
multisample enable/disable), we created a meta_set_enable() function
that could be used by meta ops to enable and disable GL_MULTISAMPLE
even when the GLES API was in use (the GLES API doesn't support
GL_MULTISAMPLE; it behaves as if it is always enabled).  This created
some unfortunate code duplication between meta_set_enable() and the
existing _mesa_set_enable() function.

This patch eliminates the duplication by creating a
_mesa_set_multisample() function, which is used by both meta ops and
_mesa_set_enable() to enable/disable GL_MULTISAMPLE.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years ago_mesa_meta_GenerateMipmap: Generate separate shaders for glsl 120 / 130
Anuj Phogat [Wed, 12 Sep 2012 00:32:49 +0000 (17:32 -0700)]
_mesa_meta_GenerateMipmap: Generate separate shaders for glsl 120 / 130

glsl version of _mesa_meta_GenerateMipmap() would require separate
shaders for glsl 120 and 130.

V2: Removed the code for integer textures as ARB is planning to
    disallow automatic mipmap generation for integer textures.

NOTE: This is a candidate for stable branches.

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years ago_mesa_meta_GenerateMipmap: Support all texture targets by generating shaders at runtime
Anuj Phogat [Fri, 31 Aug 2012 20:51:39 +0000 (13:51 -0700)]
_mesa_meta_GenerateMipmap: Support all texture targets by generating shaders at runtime

glsl path of _mesa_meta_GenerateMipmap() function would require different fragment
shaders depending on the texture target. This patch adds the code to generate
appropriate fragment shader programs at run time.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=54296

V2: Removed the code for integer textures as ARB is planning to
    disallow automatic mipmap generation for integer textures.
    Now using ralloc_asprintf in setup_glsl_generate_mipmap().

NOTE: This is a candidate for stable branches.

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agoradeon/llvm: Support frint on SI
Christian König [Fri, 14 Sep 2012 14:32:43 +0000 (16:32 +0200)]
radeon/llvm: Support frint on SI

Gets VDPAUs shaders working again.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
11 years agor600g: consolidate decompression code for the blitter
Marek Olšák [Wed, 12 Sep 2012 22:41:26 +0000 (00:41 +0200)]
r600g: consolidate decompression code for the blitter

11 years agor600g: do not require MSAA renderbuffer support if not asked for
Marek Olšák [Sat, 8 Sep 2012 13:50:30 +0000 (15:50 +0200)]
r600g: do not require MSAA renderbuffer support if not asked for

to allow stencil-only sampler-only formats (like X24S8)

NOTE: This is a candidate for the stable branches.

11 years agogallium/u_blitter: fix stencil-only blits
Marek Olšák [Sat, 8 Sep 2012 13:30:24 +0000 (15:30 +0200)]
gallium/u_blitter: fix stencil-only blits

NOTE: This is a candidate for the stable branches.

11 years agor300g: fix colormask with non-BGRA formats
Marek Olšák [Fri, 14 Sep 2012 03:34:23 +0000 (05:34 +0200)]
r300g: fix colormask with non-BGRA formats

NOTE: This is a candidate for the stable branches.

11 years agor600g: reduce quant mode on evergreen+
Alex Deucher [Thu, 13 Sep 2012 21:25:42 +0000 (17:25 -0400)]
r600g: reduce quant mode on evergreen+

Seems to have an affect on the allowable range of
values.  Set evergreen+ to 1/256 to match 6xx/7xx.

fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=54877

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
11 years agoradeonsi: don't use a staging resource for large transfers
Marek Olšák [Thu, 13 Sep 2012 18:20:46 +0000 (20:20 +0200)]
radeonsi: don't use a staging resource for large transfers

It kills performance if the resource is linear.

11 years agor600g: don't use a staging resource for large transfers
Marek Olšák [Thu, 13 Sep 2012 18:20:46 +0000 (20:20 +0200)]
r600g: don't use a staging resource for large transfers

It kills performance if the resource is linear.

11 years agor600g: convert the remnants of VGT state into immediate register writes/atoms v4
Marek Olšák [Mon, 10 Sep 2012 23:16:32 +0000 (01:16 +0200)]
r600g: convert the remnants of VGT state into immediate register writes/atoms v4

v2: Group vgt register together to avoid lockup
v3: Split multi primitive register and index bias register
v4: Bump R600_NUM_ATOMS

Signed-off-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: emit the primitive type and associated regs only if the type is changed
Marek Olšák [Mon, 10 Sep 2012 19:59:38 +0000 (21:59 +0200)]
r600g: emit the primitive type and associated regs only if the type is changed

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: add clip_misc_state for clip registers emitted in draw_vbo
Marek Olšák [Mon, 10 Sep 2012 19:38:09 +0000 (21:38 +0200)]
r600g: add clip_misc_state for clip registers emitted in draw_vbo

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: fix computing how much space is needed for a draw command
Marek Olšák [Mon, 10 Sep 2012 18:38:03 +0000 (20:38 +0200)]
r600g: fix computing how much space is needed for a draw command

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: fix the number of CS dwords of cb_misc_state
Marek Olšák [Mon, 10 Sep 2012 18:04:19 +0000 (20:04 +0200)]
r600g: fix the number of CS dwords of cb_misc_state

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: atomize clip state
Marek Olšák [Mon, 10 Sep 2012 18:03:09 +0000 (20:03 +0200)]
r600g: atomize clip state

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: atomize blend color
Marek Olšák [Mon, 10 Sep 2012 17:41:39 +0000 (19:41 +0200)]
r600g: atomize blend color

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: atomize viewport state
Marek Olšák [Mon, 10 Sep 2012 17:28:34 +0000 (19:28 +0200)]
r600g: atomize viewport state

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: atomize stencil ref state
Marek Olšák [Mon, 10 Sep 2012 17:10:46 +0000 (19:10 +0200)]
r600g: atomize stencil ref state

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: remove unused state ID definitions
Marek Olšák [Mon, 10 Sep 2012 16:40:52 +0000 (18:40 +0200)]
r600g: remove unused state ID definitions

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: initialize the first CS just like any other CS
Marek Olšák [Mon, 10 Sep 2012 03:56:46 +0000 (05:56 +0200)]
r600g: initialize the first CS just like any other CS

by reusing the CS initialization in r600_context_flush.

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: add support for geometry shader samplers and constant buffers
Marek Olšák [Mon, 10 Sep 2012 03:43:12 +0000 (05:43 +0200)]
r600g: add support for geometry shader samplers and constant buffers

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: put sampler states and views into an array indexed by shader type
Marek Olšák [Mon, 10 Sep 2012 02:53:33 +0000 (04:53 +0200)]
r600g: put sampler states and views into an array indexed by shader type

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: do fine-grained sampler state updates
Marek Olšák [Mon, 10 Sep 2012 02:06:20 +0000 (04:06 +0200)]
r600g: do fine-grained sampler state updates

Update only those sampler states which are changed in a shader stage,
instead of always updating all sampler states in the shader stage.
That requires keeping a bitmask of those states which are enabled, and those
states which are dirty at a given point (subset of enabled states).

This is similar to how sampler views, constant buffers, and vertex buffers
are handled.

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: consolidate set_viewport_state functions
Marek Olšák [Sun, 9 Sep 2012 23:08:10 +0000 (01:08 +0200)]
r600g: consolidate set_viewport_state functions

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: consolidate set_sampler_views functions
Marek Olšák [Sun, 9 Sep 2012 23:04:47 +0000 (01:04 +0200)]
r600g: consolidate set_sampler_views functions

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: put constant buffer state into an array indexed by shader type
Marek Olšák [Sun, 9 Sep 2012 22:56:45 +0000 (00:56 +0200)]
r600g: put constant buffer state into an array indexed by shader type

to easily and robustly handle multiple shader stages

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: cleanup state function names
Marek Olšák [Sun, 9 Sep 2012 22:34:37 +0000 (00:34 +0200)]
r600g: cleanup state function names

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: consolidate initialization of common state functions
Marek Olšák [Sun, 9 Sep 2012 22:28:46 +0000 (00:28 +0200)]
r600g: consolidate initialization of common state functions

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agor600g: simplify flushing
Marek Olšák [Sun, 9 Sep 2012 04:08:39 +0000 (06:08 +0200)]
r600g: simplify flushing

Based on the patch called "simplify and fix flushing and synchronization"
by Jerome Glisse.

Rebased, removed unneded code, simplified more and cleaned up.

Also, SH_ACTION_ENA is not set when changing shaders (hw doesn't seem
to need it). It's only used to flush constant buffers.

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
11 years agoradeon/llvm: Fix lowering of vbuild
Tom Stellard [Tue, 11 Sep 2012 19:24:32 +0000 (15:24 -0400)]
radeon/llvm: Fix lowering of vbuild

Some of the old AMDIL code was hard-coding subreg indices when creating
the VBUILD node, which was making it difficult to match the
vector_insert patterns.

11 years agoradeon/llvm: Support fmul on SI
Tom Stellard [Tue, 11 Sep 2012 19:21:09 +0000 (15:21 -0400)]
radeon/llvm: Support fmul on SI