c81cce7831
Disable vertex shader fog, compute fog in fragment shader.
2008-09-24 10:04:17 -07:00
19d77d6cfa
temporarily set the FRAG_BIT_FOGC bit in InputsRead when fog is enabled
...
(cherry picked from commit 63be96bdc7
2008-09-24 10:03:27 -07:00
8e7d941d7a
mesa: fix main/ prefix in include
2008-09-23 21:08:50 -07:00
33fef8be82
vbo: unmap and remap immediate vbo before/after each draw.
...
Also use BufferData(NULL) to get fresh storage and avoid synchronous
operation where we would have to flush and wait for the fence after each
draw because of the map.
This will chew through a whole load of buffer space on small draws, so
it isn't a proper solution. Need to support a no-fence or append mapping
mode to do this right, or use user buffers.
2008-09-23 18:26:17 -07:00
6f765fbde4
added vbo_use_buffer_objects() to specify that immediate mode data should be put into bufferobjects
2008-09-23 18:26:00 -07:00
b36bc54d3c
vbo: seed initial max_element value with a more likely candidate
...
(cherry picked from commit 026e7731e5
2008-09-23 18:05:48 -07:00
2a7dc79273
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/shader/shader_api.c
2008-09-23 17:40:49 -07:00
9acf207277
mesa: s/GL_POLYGON+1/PRIM_OUTSIDE_BEGIN_END/
...
(cherry picked from commit 8a369b909a
2008-09-23 17:36:01 -07:00
5b98236e75
mesa: glsl: fix glGetUniform for matrix queries
...
(cherry picked from commit 7a6eba54d0
2008-09-23 17:34:59 -07:00
eda291e316
mesa: glsl: fix a number of glUniform issues
...
Additional error checking.
Allow setting elements of uniform arrays. This involves encoding both
a uniform location and a parameter offset in the value returned by
glGetUniformLocation().
Limit glUniform[if]v()'s count to the size of the uniform array.
When setting bool-valued uniforms, convert all float/int values to 0 or 1.
2008-09-23 17:33:49 -07:00
bda6ad273d
mesa: glsl: fix error check in get_uniformfv()
...
(cherry picked from commit 18cd9c229a
2008-09-23 17:33:19 -07:00
62dd7575f0
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/main/drawpix.c
src/mesa/shader/prog_uniform.c
src/mesa/shader/slang/slang_link.c
2008-09-23 17:24:39 -07:00
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
452a592ca4
mesa: Apply MSVC portability fixes from Alan Hourihane.
2008-09-23 17:20:38 -07:00
9118b02fd0
mesa: update program->NumAddressRegs field in _slang_update_inputs_outputs()
2008-09-23 17:11:25 -07:00
c79779aff0
mesa: add fwd decl of fill_in_entrypoint_offset()
...
(cherry picked from commit b1eff0228b
2008-09-23 17:09:24 -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
Brian
Keith Whitwell
José Fonseca
Eric Anholt
Robert Ellison
Ian Romanick
Jonathan White
Michel Dänzer
Jakob Bornecrantz
Michal Krol