2cb3d2b7a0
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/glapi/glapi_getproc.c
src/mesa/main/image.c
src/mesa/shader/slang/slang_link.c
2008-09-23 17:23:14 -07:00
ec76910187
mesa: new gl_fragment_program fields indicating use of fog, front-facing, point coord
...
(cherry picked from commit d7a7b0a10d
2008-09-23 17:01:05 -07:00
03bafd1f9f
Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in the drivers.
...
This should probably be pulled into main-line Mesa...
(cherry picked from commit 324ecadbfd
2008-09-23 16:59:56 -07:00
a97226352f
mesa: refactor: move GetProcAddress code from glapi.c into new glapi_getproc.c file
2008-09-23 16:56:23 -07:00
9e7c0724bb
Merge commit 'origin/master' into gallium-0.2
2008-09-23 15:53:29 -07:00
d533da2db8
i965: Cope with batch getting flushed in the middle of batchbuffer emits.
...
This isn't required for GEM (at least, yet), but the check_aperture code
for non-GEM results in batch getting flushed during emit. brw_state_upload
restarts state emits, but a bunch of the state emit functions were assuming
that they would be called exactly once, after prepare and before new_batch.
Bug #17179 .
2008-09-23 15:53:29 -07:00
a0bd3972b6
remove leftover merge conflict markers
2008-09-23 15:53:19 -07:00
4b038e24b0
intel: Add missing include files for meta drawpixels since mesa shuffling.
2008-09-23 15:32:41 -07:00
f85ea6837d
intel: Replace pbo-only drawpixels function with a generic Mesa metaops.
...
Improves performance of some oglconform regression tests 9x.
2008-09-23 13:31:19 -07:00
15487e46a2
i915: Fix overlapping CopyPixels with negative pixel zoom.
...
Fixes a failure in pixel-pos.c oglconform test.
2008-09-23 13:31:12 -07:00
b9532f078a
i915: fix crash in flush_prim -> wait_flips -> flush_batch -> flush_prim.
2008-09-23 13:30:03 -07:00
1c79cf15c4
CELL: fix colormask code generation
...
The colormask code generation had assumed that its input packed pixels were
in RGBA format. In fact, the format they're in is dependent on the
pipe color format.
Now the color format is passed in to gen_colormask(), and proper
color format-dependent SPU code is generated.
2008-09-23 10:11:59 -06:00
6901d6ef24
CELL: improve legibility of CELL_DEBUG environment variable output
2008-09-23 10:09:36 -06:00
2511d57fa4
i965: Adapt to new TNL program tracking semantics
...
This fixes bugzilla #17718 .
2008-09-22 17:23:40 -07:00
6642380841
cell: Fixed bug with absolute, negate, set-negative logic in source fetch for TGSI instructions. The logic should operate on the origin channel not the swizzled channel.
...
Please enter the commit message for your changes.
2008-09-22 14:33:53 -06:00
6b3ec9ec2b
cell: Added TRUNC, SWZ (extended) and XPD instructions, verified against softpipe. Optimized FLR and FRC. Fixed writeback logic for DP3, DP4 and DPH.
2008-09-22 13:13:50 -06:00
56c476395f
cell: Added DPH instruction and verified against softpipe.
2008-09-22 10:54:50 -06:00
bb60fb77c7
r300: Adapt to the removal of _tnl_ProgramCacheInit() and friends.
2008-09-22 10:47:06 -06:00
5106f1b9ac
Remove incorrect test from mmAllocMem.
...
0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was
broken by this.
2008-09-22 10:47:06 -06:00
c9122c0c03
mesa: Remove left over merge conflicts
2008-09-22 12:47:57 +02:00
ed4c6cbe01
r300: Adapt to the removal of _tnl_ProgramCacheInit() and friends.
2008-09-22 11:49:34 +02:00
78f4a695ad
Remove incorrect test from mmAllocMem.
...
0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was
broken by this.
2008-09-22 11:48:26 +02:00
dace236c5f
Merge branch 'master' into gallium-0.2
...
Conflicts:
src/mesa/glapi/glapi.h
src/mesa/main/api_exec.c
src/mesa/main/attrib.c
src/mesa/main/clear.c
src/mesa/main/context.c
src/mesa/main/mfeatures.h
src/mesa/main/mipmap.c
src/mesa/main/mipmap.h
src/mesa/main/readpix.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texformat.c
src/mesa/main/texparam.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_context.c
src/mesa/x86/common_x86_asm.S
2008-09-21 22:30:55 -07:00
6fd15dd806
mesa: allow for extra per-context init
...
(cherry picked from commit 815cdcfbc0
2008-09-21 22:13:57 -07:00
1b7e909845
mesa: texture crop rect state
...
(cherry picked from commit c01fbc7866
2008-09-21 22:13:57 -07:00
93c90d34d1
mesa: set point state
...
(cherry picked from commit af3d9dba56
2008-09-21 22:13:57 -07:00
868c09a267
mesa: fix some feature tests
...
(cherry picked from commit 74b14fe6dd
2008-09-21 22:13:57 -07:00
8122ab2dfd
mesa: fix some pixel transfer state tests for depth formats
...
(cherry picked from commit 966e199e40
2008-09-21 22:13:57 -07:00
6bc8749cd5
mesa: fix issues causing warnings on Windows
2008-09-21 22:13:57 -07:00
9614eac85d
mesa: Silence compiler warnings on Windows.
2008-09-21 22:13:57 -07:00
ce1685ce94
mesa: comments about vectors vs components
2008-09-21 22:13:57 -07:00
eb10fa3ed6
mesa: remove debug code
2008-09-21 22:13:57 -07:00
6246dd890f
mesa: implement glGetUniformiv() with new ctx->Driver function
...
The old implementation could overwrite the caller's param buffer.
2008-09-21 22:13:56 -07:00
48cba703fa
mesa: added case for fixed pt
2008-09-21 22:13:56 -07:00
1cf2c8a043
mesa: point size arrays
2008-09-21 22:13:56 -07:00
f8e50dd796
mesa: Replace deprecated __MSC__ macro.
2008-09-21 22:13:56 -07:00
60325331a8
mesa: More signed/unsigned float/integer fixes.
2008-09-21 22:13:56 -07:00
457d7218b8
mesa: Use appropriate unsigned/signed, float/integer types.
2008-09-21 22:13:56 -07:00
88f729e4ec
mesa: Use _mesa_bsearch.
2008-09-21 22:13:56 -07:00
baa76e9aa2
mesa: bsearch implementation for WinCE.
2008-09-21 22:13:56 -07:00
2e8af5ffcf
mesa: ASSERT macro is already defined by WinCE headers.
...
Even when just the standard headers are used....
2008-09-21 22:13:56 -07:00
c115616bda
mesa: init ctx->RenderMode
2008-09-21 22:13:56 -07:00
d17485fef9
mesa: GL_BYTE vertex/texcoord arrays
2008-09-21 22:13:55 -07:00
394c1d1c53
mesa: initial support for fixed-pt vertex arrays
2008-09-21 22:13:55 -07:00
bb00f09f1b
mesa: refactor: move initialization of DefaultPacking state.
2008-09-21 22:13:55 -07:00
9b8b58b79a
mesa: fix errors in prev commit
2008-09-21 22:13:55 -07:00
3a4bed8f08
mesa: revamp glBlendFunc loopback
2008-09-21 22:13:55 -07:00
85f553d3c1
mesa: fix some FEATURE_x tests
2008-09-21 22:13:55 -07:00
b51d73dd94
mesa: test for FEATURE_ATI_fragment_shader
2008-09-21 22:13:55 -07:00
715715e230
mesa: fix ReadBuffer initialization
2008-09-21 22:13:55 -07:00
Keith Whitwell