OSDN Git Service
Brian Paul [Fri, 23 Apr 2010 19:13:27 +0000 (13:13 -0600)]
st/mesa: re-do binding flags in st_ChooseTextureFormat(), again
Try to specify render target bindings flags first. If that fails, try
again with just sampler view binding. Note that we try to create the
texture resource with render target binding flags later when we allocate
the texture. Then, in FBO validation, we check if we can actually render
to the textures. If that fails, we generate GL_FRAMEBUFFER_UNSUPPORTED_EXT.
Changes suggested by Jose.
Brian Paul [Fri, 23 Apr 2010 19:12:55 +0000 (13:12 -0600)]
st/mesa: replace 'usage' with 'bindings'
Brian Paul [Fri, 23 Apr 2010 19:05:13 +0000 (13:05 -0600)]
st/mesa: replace 'usage' with 'bindings' to be consistent
Plus, update comments and formatting.
Ian Romanick [Fri, 23 Apr 2010 18:52:14 +0000 (11:52 -0700)]
Merge branch '7.8'
Aaron Plattner [Thu, 22 Apr 2010 16:30:42 +0000 (09:30 -0700)]
Fix __glXInitializeVisualConfigFromTags's handling of unrecognized fbconfig tags.
__glXInitializeVisualConfigFromTags doesn't skip the payload of
unrecognized tags. Instead, it treats the value as if it were the
next tag, which can happen if the server's GLX extension is not
Mesa's. For example, this falls down when NVIDIA sends a
GLX_FLOAT_COMPONENTS_NV = 0 pair, causing
__glXInitializeVisualConfigFromTags to bail out early.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Stephen Johnson [Fri, 23 Apr 2010 18:34:21 +0000 (19:34 +0100)]
draw: use FREE() instead of free()
Brian Paul [Fri, 23 Apr 2010 18:28:55 +0000 (12:28 -0600)]
st/mesa: don't set RENDER_TARGET/DEPTH_STENCIL flag for compressed textures
Brian Paul [Fri, 23 Apr 2010 18:15:06 +0000 (12:15 -0600)]
st/mesa: get rid of default_deep_rgba_format()
This special-case code used to be used for the accum buffer but
the accum buffer implementation was changed some time ago.
Brian Paul [Fri, 23 Apr 2010 18:01:50 +0000 (12:01 -0600)]
mesa: make is_compressed_format() non-static
Brian Paul [Fri, 23 Apr 2010 17:58:52 +0000 (11:58 -0600)]
mesa: faster, simpler is_compressed_format()
Brian Paul [Fri, 23 Apr 2010 16:12:30 +0000 (10:12 -0600)]
llvmpipe: rename texture refs to resource refs
Alan Hourihane [Fri, 23 Apr 2010 18:26:03 +0000 (19:26 +0100)]
llvmpipe: update for half float formats
José Fonseca [Fri, 23 Apr 2010 16:07:14 +0000 (17:07 +0100)]
st/xlib: Try to propagate failure to create framebuffer.
Doesn't help much, since it is ignored by st_framebuffer_validate.
José Fonseca [Fri, 23 Apr 2010 16:04:06 +0000 (17:04 +0100)]
softpipe: YUV textures should be supported.
José Fonseca [Fri, 23 Apr 2010 16:03:10 +0000 (17:03 +0100)]
mesa/st: Remove dead members.
José Fonseca [Fri, 23 Apr 2010 15:56:55 +0000 (16:56 +0100)]
sw/xlib: Fallback to XPutImage when shmget fails.
After continuously running regression tests on Ubuntu for 2 days, shmget
mysteriously starts to fail. Even when the X server is reset.
This allow rendering to proceed, albeit using a slower presentation path.
Brian Paul [Fri, 23 Apr 2010 15:13:03 +0000 (09:13 -0600)]
llvmpipe: increase max 2D texture / surface size to 4K x 4K
Brian Paul [Fri, 23 Apr 2010 15:10:18 +0000 (09:10 -0600)]
llvmpipe: rename MAXWIDTH, MAXHEIGHT
Brian Paul [Fri, 23 Apr 2010 15:07:55 +0000 (09:07 -0600)]
llvmpipe: rename lp_tile_size.h to lp_limits.h
Collect the various driver limits in one place since.
Brian Paul [Fri, 23 Apr 2010 15:03:10 +0000 (09:03 -0600)]
llvmpipe: move LP_MAX_TEXTURE_x_LEVELS, etc to lp_tile_size.h
Jerome Glisse [Fri, 23 Apr 2010 10:08:36 +0000 (12:08 +0200)]
Merge remote branch 'origin/7.8'
Jerome Glisse [Fri, 23 Apr 2010 09:56:06 +0000 (11:56 +0200)]
r600: don't enable depth test if there is no depth buffer
If there is no depth buffer bound to current context don't
enable depth test. GL states that if depth test is enabled
without depth buffer it's as if depth buffer always pass.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Michel Dänzer [Fri, 23 Apr 2010 09:18:29 +0000 (11:18 +0200)]
Merge branch '7.8'
Michel Dänzer [Fri, 23 Apr 2010 09:14:13 +0000 (11:14 +0200)]
glx/dri2: Fix build with dri2proto which doesn't define X_DRI2SwapInterval.
Vinson Lee [Fri, 23 Apr 2010 07:59:12 +0000 (00:59 -0700)]
llvmpipe: Remove unused variable.
Eric Anholt [Thu, 22 Apr 2010 22:24:26 +0000 (15:24 -0700)]
i965: Fix assertion for surface tile offset usage on Ironlake.
Fixes assertion failure in fbo-generatemipmap-npot.
Eric Anholt [Tue, 20 Apr 2010 20:40:28 +0000 (13:40 -0700)]
i965: Fix scissoring when width or height is 0.
We would run into trouble due to the hardware using inclusive numbers
and the subtraction to handle that producing negative (meaning large
positive) coordinates.
Bug #27643.
Zack Rusin [Thu, 22 Apr 2010 22:36:07 +0000 (18:36 -0400)]
gallivm: implement indirect addressing over temporaries
a bit more involved than indirect addressing over consts, but still
fairly reasonable. we allocate an array instead of individual alloca's,
and we do it only if the shader does indirect addressing.
Zack Rusin [Thu, 22 Apr 2010 21:31:55 +0000 (17:31 -0400)]
gallivm: implement indirect addressing over constants
implement indirect addressing (ARL and ARR instructions) when used
with CONST's. indirect addressing over other vars (temps, inputs, outputs)
is not supported yet.
Tormod Volden [Thu, 22 Apr 2010 19:52:15 +0000 (21:52 +0200)]
radeon: 9800 SE has only one quadpipe
Although these cards have 2 pipelines on the silicon only
the first passed the QA and the other should be disabled.
http://www.digital-daily.com/video/ati-radeon9800se/
http://www.rojakpot.com/showarticle.aspx?artno=101&pgno=1
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Brian Paul [Thu, 22 Apr 2010 20:39:03 +0000 (14:39 -0600)]
gallium: use better param name
Brian Paul [Thu, 22 Apr 2010 20:35:54 +0000 (14:35 -0600)]
gallivm: remove Z/stencil special case code in lp_build_sample_offset()
Fixes progs/tests/zreaddraw.c and progs/demos/shadowtex.c
Brian Paul [Thu, 22 Apr 2010 20:35:21 +0000 (14:35 -0600)]
st/mesa: assert that binding flags are properly set for drawing surfaces
Brian Paul [Thu, 22 Apr 2010 20:34:22 +0000 (14:34 -0600)]
st/mesa: fix binding flags in st_ChooseTextureFormat()
See comment for more info.
Brian Paul [Thu, 22 Apr 2010 20:29:29 +0000 (14:29 -0600)]
progs/tests: asst. improvements to zreaddraw.c
Jesse Barnes [Thu, 22 Apr 2010 19:49:03 +0000 (12:49 -0700)]
DRI2/GLX: check for vblank_mode in DRI2 GLX code
Re-add support for the vblank_mode environment and configuration
variable. Useful for benchmarking and app control.
Jesse Barnes [Thu, 22 Apr 2010 19:47:41 +0000 (12:47 -0700)]
DRI2: add config query extension
Add a new DRI2 configuration query extension. Allows for DRI2 client
code to query for common DRI2 configuration options.
José Fonseca [Thu, 22 Apr 2010 19:38:36 +0000 (20:38 +0100)]
llvmpipe: Undo zs tiling changes.
tile_w/tile_h have different meaning there.
This partialy reverts commit
ccdc6b5913885866e100780bfd661672c9a5d23c.
José Fonseca [Thu, 22 Apr 2010 18:51:10 +0000 (19:51 +0100)]
gallium/docs: Unswap PIPE_BIND_SHARED's comment.
Brian Paul [Thu, 22 Apr 2010 18:44:40 +0000 (12:44 -0600)]
gallium/docs: many updates to screen.rst
Put PIPE_BIND_ and PIPE_TEXTURE_GEOM_ prefixes on token names so
that they can be found with grep. This needs to be done in more places.
Corrected/improved a lot of information and grammer.
I don't know how to properly format everything - someone else can take
care of that.
José Fonseca [Thu, 22 Apr 2010 18:24:30 +0000 (19:24 +0100)]
llvmpipe: Portability fixes.
José Fonseca [Thu, 22 Apr 2010 18:23:40 +0000 (19:23 +0100)]
llvmpipe: Fix rendering to non 32bpp formats.
Tiled layout always used 32bpp, therefore linear/tiled strides are not
related.
Zack Rusin [Thu, 22 Apr 2010 17:56:54 +0000 (13:56 -0400)]
gallivm: update comments
Zack Rusin [Thu, 22 Apr 2010 17:45:25 +0000 (13:45 -0400)]
gallivm: fix nested cont statements
Zack Rusin [Thu, 22 Apr 2010 17:43:37 +0000 (13:43 -0400)]
gallivm: fix nested break statemants
Zack Rusin [Thu, 22 Apr 2010 17:00:48 +0000 (13:00 -0400)]
gallivm: make sure we return the correct type when approximating log's
José Fonseca [Thu, 22 Apr 2010 17:22:22 +0000 (18:22 +0100)]
llvmpipe: Use resource_is_texture() consistently.
Otherwise slightly difference order causes assertion failures.
Also remove mentions of PIPE_BIND_SCANOUT/PIPE_BIND_SHARED. They are not
propoer bind flags and will likely be deprecated. If surfaces should
be passed to the winsys then they should have the DISPLAY_TARGET flag
set, which is a proper bind flag.
Brian Paul [Thu, 22 Apr 2010 17:33:26 +0000 (11:33 -0600)]
gallium: fix comment language, remove dangling comment
Brian Paul [Thu, 22 Apr 2010 17:04:04 +0000 (11:04 -0600)]
st/mesa: consolidate code for finding supported formats
Brian Paul [Thu, 22 Apr 2010 16:47:53 +0000 (10:47 -0600)]
st/mesa: refactor depth/stencil format selection code
Brian Paul [Thu, 22 Apr 2010 16:02:18 +0000 (10:02 -0600)]
mesa: sort texel fetch/store table by format index
Brian Paul [Thu, 22 Apr 2010 17:10:19 +0000 (11:10 -0600)]
Merge branch '7.8'
Conflicts:
src/mesa/state_tracker/st_format.c
Brian Paul [Thu, 22 Apr 2010 16:26:20 +0000 (10:26 -0600)]
st/mesa: add cases for MESA_FORMAT_Z24_X8, MESA_FORMAT_X8_Z24
Brian Paul [Thu, 22 Apr 2010 14:46:46 +0000 (08:46 -0600)]
mesa: fix conversion errors in signed_rgba8888[rev] texel fetch
Without the cast the returned texel colors were wrong.
Also, we don't need the "& 0xff" part anymore.
Bug found by Vinson Lee.
José Fonseca [Thu, 22 Apr 2010 17:06:05 +0000 (18:06 +0100)]
llvmpipe: Fix resource_is_texture.
It was missing PIPE_BIND_RENDER_TARGET, causing assertion failures for
pure render targets.
Also bind flags are too variable and complex for a good assessment for
whether the resource is a texture or not. Target is more concise.
José Fonseca [Thu, 22 Apr 2010 14:12:30 +0000 (15:12 +0100)]
llvmpipe: Do not advertise S3TC rendering support.
José Fonseca [Thu, 22 Apr 2010 14:11:57 +0000 (15:11 +0100)]
llvmpipe: Fix typo in assert.
José Fonseca [Thu, 22 Apr 2010 14:11:34 +0000 (15:11 +0100)]
u_format: Reduce code duplication.
Vinson Lee [Thu, 22 Apr 2010 07:45:27 +0000 (00:45 -0700)]
gallivm: Remove unused variable.
Alex Deucher [Thu, 22 Apr 2010 06:37:34 +0000 (02:37 -0400)]
r300g: fix vertex unit setup
RV3xx is 2, RV560,RV570 is 8
Noticed by Tormod Volden.
Alex Deucher [Thu, 22 Apr 2010 06:33:10 +0000 (02:33 -0400)]
r300: fix vertex unit setup
RV3xx is 2, RV560,RV570 is 8
Noticed by Tormod Volden.
Vinson Lee [Thu, 22 Apr 2010 01:45:44 +0000 (18:45 -0700)]
gallium/util: Fix deviation calculation in u_cache.
The approximate deviation calculation was using the entire cache's total
instead of each cache entry's total.
Vinson Lee [Thu, 22 Apr 2010 01:31:01 +0000 (18:31 -0700)]
gallium/tests: Add test case for u_cache.
Brian Paul [Thu, 22 Apr 2010 00:22:15 +0000 (18:22 -0600)]
gallivm: added some assertions in loop-gen code
We're hitting these assertions with nested loops...
Aaron Plattner [Thu, 22 Apr 2010 00:13:19 +0000 (18:13 -0600)]
progs/demos: Fix the progs/demos/rain help text
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Wed, 21 Apr 2010 23:58:26 +0000 (17:58 -0600)]
gallivm: fix copy&paste error: s/cont_stack_size/break_stack_size/
Brian Paul [Wed, 21 Apr 2010 23:57:44 +0000 (17:57 -0600)]
gallivm: emit_instruction() is boolean
Brian Paul [Wed, 21 Apr 2010 22:30:04 +0000 (16:30 -0600)]
progs/glsl: better comments
Brian Paul [Wed, 21 Apr 2010 22:29:13 +0000 (16:29 -0600)]
llvmpipe: add missing dependency in Makefile
Brian Paul [Wed, 21 Apr 2010 22:27:23 +0000 (16:27 -0600)]
gallivm: implement TGSI KILP
As in tgsi_exec.c we don't actually rely on condition codes; we do
an unconditional kill. The only predication comes from the execution
mask which applies inside loops/conditionals.
José Fonseca [Wed, 21 Apr 2010 16:30:39 +0000 (17:30 +0100)]
draw: Make LLVM integration work without llvmpipe too (e.g. sofptipe).
Prevents the assertion failure.
Marek Olšák [Wed, 21 Apr 2010 20:53:11 +0000 (22:53 +0200)]
radeon: fix warning
Marek Olšák [Wed, 21 Apr 2010 20:48:07 +0000 (22:48 +0200)]
r300g: raise the max index for generic varyings to 32
This should fix an assertion failure in the game Heroes of Newearth.
Yes, the game seems to generate semantic indices greater than 15.
Brian Paul [Wed, 21 Apr 2010 20:23:42 +0000 (14:23 -0600)]
softpipe: call draw_wide_point_sprites()
Brian Paul [Wed, 21 Apr 2010 20:24:26 +0000 (14:24 -0600)]
gallium/draw: fix point sprite handling
New draw API function to indicate whether or not to convert points to
quads for sprite rasterization.
Fix point-to-quad conversion regression in the wide-point stage. We
need to check the pipe_rasterizer_state::point_quad_rasterization flag.
Brian Paul [Wed, 21 Apr 2010 20:16:02 +0000 (14:16 -0600)]
gallium/draw: use local var to simplify code
Brian Paul [Wed, 21 Apr 2010 16:30:53 +0000 (10:30 -0600)]
llvmpipe: consolidate texture memory allocation code
And fix incorrect allocation of linear memory for display targets.
This fixes fd.o bugs 27761 and 27762.
Brian Paul [Wed, 21 Apr 2010 15:58:15 +0000 (09:58 -0600)]
st/glx: variable 'i' is an enum
Now we can get see 'i' as an enum name instead of a plain integer in gdb.
Jakob Bornecrantz [Wed, 21 Apr 2010 13:48:54 +0000 (14:48 +0100)]
targets: Don't check if we should use trace
Trace does its own checking, and it used the GALLIUM_TRACE variable
as well, but expected a file and not a bool argument.
José Fonseca [Wed, 21 Apr 2010 09:19:39 +0000 (11:19 +0200)]
mesa/st: Translate a few more mesa/gallium formats.
These endup used by Xvnc.
Vinson Lee [Wed, 21 Apr 2010 05:56:39 +0000 (22:56 -0700)]
llvmpipe: Remove unused variable.
Brian Paul [Wed, 21 Apr 2010 03:17:35 +0000 (21:17 -0600)]
mesa: do version checking for GL 3.x queries
Brian Paul [Wed, 21 Apr 2010 03:02:09 +0000 (21:02 -0600)]
mesa: API and state for GL 3.1 primitive restart
Brian Paul [Wed, 21 Apr 2010 02:52:56 +0000 (20:52 -0600)]
mesa: add GL 3.2 GL_CONTEXT_PROFILE_MASK query
Brian Paul [Wed, 21 Apr 2010 02:44:54 +0000 (20:44 -0600)]
mesa: remove some comments
Zhenyu Wang [Mon, 19 Apr 2010 08:27:10 +0000 (16:27 +0800)]
intel: Add Sandybridge mobile chipset id
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Zhenyu Wang [Mon, 19 Apr 2010 07:51:50 +0000 (15:51 +0800)]
intel: Clean up chipset name and gen num for Ironlake
Rename old IGDNG to Ironlake, and set 'gen' number for
Ironlake as 5, so tracking the features with generation num
instead of special is_ironlake flag.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Vinson Lee [Wed, 21 Apr 2010 01:48:04 +0000 (18:48 -0700)]
gallivm: Remove unnecessary headers.
Vinson Lee [Wed, 21 Apr 2010 00:22:26 +0000 (17:22 -0700)]
i965g: s/inttypes.h/stdint.h/
MSVC doesn't have either but Mesa has stdint.h at include/c99.
Vinson Lee [Wed, 21 Apr 2010 00:02:03 +0000 (17:02 -0700)]
i965g: Remove unnecessary header.
Vinson Lee [Tue, 20 Apr 2010 23:40:55 +0000 (16:40 -0700)]
llvmpipe: Change return type of declaration to match code.
Commit
2142108e0e1cf1ed8d0142e9c41fe1947abe0907 changed the return type
of llvmpipe_get_texture_image_address function but didn't change the
declaration.
Fixes build.
Brian Paul [Tue, 20 Apr 2010 23:28:33 +0000 (17:28 -0600)]
llvmpipe: code consolidation
Brian Paul [Tue, 20 Apr 2010 23:19:30 +0000 (17:19 -0600)]
llvmpipe: remove debug code and simplify
Brian Paul [Tue, 20 Apr 2010 23:14:47 +0000 (17:14 -0600)]
llvmpipe: fix cube face addressing bug
Fixes fd.o bug 27760 (pigit fbo-cubemap).
Brian Paul [Tue, 20 Apr 2010 23:14:21 +0000 (17:14 -0600)]
llvmpipe: whitespace fix
Jakob Bornecrantz [Tue, 20 Apr 2010 22:59:38 +0000 (23:59 +0100)]
gallium: Fix copy typo
Jakob Bornecrantz [Tue, 20 Apr 2010 22:31:39 +0000 (23:31 +0100)]
svga: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:31:25 +0000 (23:31 +0100)]
radeong: Minor clean up of winsys
Also try to wrap trace around driver on non-debug builds, its free.
Jakob Bornecrantz [Tue, 20 Apr 2010 22:31:07 +0000 (23:31 +0100)]
nouveau: Minor clean up of winsys
Jakob Bornecrantz [Tue, 20 Apr 2010 22:30:41 +0000 (23:30 +0100)]
i965g: Minor clean up of winsys