Alan Hourihane
2e28c1fda2
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/shader/slang/slang_compile.c
2009-01-16 16:44:53 +00:00
Brian Paul
e442fe5ba5
glsl: fix broken sampler assignments
2009-01-16 09:30:58 -07:00
José Fonseca
47ca0234dc
scons: Use -std=gnu99
...
It a scary world out there: people use all sort of non standard C stuff,
and we must enable support for that in here in order to build.
-pedantic still warn us when we use that nonstandard though.
2009-01-16 15:16:55 +00:00
José Fonseca
eac69bf99e
stw: Dispatch to our stw_winsys::flush_front_buffer
...
pipe_winsys::flush_front_buffer should die someday, but this is good enough
for now.
2009-01-16 15:16:55 +00:00
Xiang, Haihao
66a4f5cf9a
i915: fallback on transfer mode
2009-01-16 16:06:33 +08:00
Karl Schultz
a740858fc0
windows: updated VC8 project file
2009-01-15 11:32:47 -07:00
Karl Schultz
e7c988d065
windows: updated mesa.def file
2009-01-15 07:05:31 -07:00
Brian Paul
4a8356209d
glsl: use _mesa_sprintf()
2009-01-15 07:05:30 -07:00
Brian Paul
e1ba29ea19
glsl: move declaration before code
2009-01-15 07:05:30 -07:00
Alan Hourihane
abd280ab0b
mesa: tweak to formatting
2009-01-15 14:02:09 +00:00
Alan Hourihane
fbf13bcb8a
mesa: check frambuffer complete status before rendering
2009-01-15 11:56:00 +00:00
Alan Hourihane
bfbb57790a
mesa: small cleanup
2009-01-15 11:54:41 +00:00
Alan Hourihane
8708fa1174
mesa: revert partial commit for 0x0 render targets
2009-01-15 11:53:59 +00:00
Alan Hourihane
263b96e160
mesa: check frambuffer complete status before rendering
2009-01-15 11:51:39 +00:00
Jakob Bornecrantz
938f1e9804
mesa: Fix merge conflicts
2009-01-15 12:33:05 +01:00
Dave Airlie
08d90fe8a5
r300: move some more function to generic
2009-01-15 16:56:50 +10:00
Dave Airlie
1a51b76343
radeon/r200/r300: start to make cmd buf useful
2009-01-15 16:45:39 +10:00
Dave Airlie
0c0a55a211
r100/r200: move to new atom style emission
2009-01-15 16:38:59 +10:00
Brian Paul
8f8435637d
mesa: bump version to 7.3-rc2
2009-01-14 17:05:26 -07:00
Brian Paul
7d08091767
glsl: fix comment
2009-01-14 17:05:26 -07:00
Brian Paul
b5f32e1d5a
glsl: minor clean-up for rect sampler test
2009-01-14 17:05:26 -07:00
Brian Paul
0dffd22349
r300: work-around FRAG_BIT_FOGC warning/error
...
See bug 17929.
Fog doesn't actually work, but the often complained about warning is
silenced.
2009-01-14 16:49:24 -07:00
Brian Paul
947d1c5b2a
i965: asst. fixes, work-arounds for FBOs and render to texture
...
OpenGL allows mixing and matching depth and stencil renderbuffers in
framebuffer objects while the hardware really only supports interleaved
depth/stencil buffers. This makes for some tricky buffer management.
An extra wrinkle is the situation where the user allocates a 16bpp depth
texture or renderbuffer then tries to render to it along with a stencil
buffer. We'd have to promote the 16bpp Z values to 24-bit Z values and
mix in the stencil values to setup the depth/stencil renderbuffer.
There's no support for that now, so always allocate 32bpp depth textures/
renderbuffers for now.
2009-01-14 16:49:24 -07:00
Brian Paul
c7f43543af
i965: fix incorrect renderbuffer DataType assignment
2009-01-14 16:49:24 -07:00
Brian Paul
5912cdff3e
i965: fix some FBO depth/stencil assertions
2009-01-14 16:49:24 -07:00
Alan Hourihane
658b1bdb1c
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
docs/install.html
docs/relnotes-7.3.html
src/mesa/shader/slang/slang_codegen.c
src/mesa/shader/slang/slang_compile.c
src/mesa/shader/slang/slang_emit.c
src/mesa/shader/slang/slang_preprocess.c
src/mesa/shader/slang/slang_preprocess.h
2009-01-14 23:33:41 +00:00
Ian Romanick
03188b09e0
intel: SW fallback maps texture images, not texture coordinates
2009-01-14 12:48:22 -08:00
Keith Whitwell
2d155f91d2
trivial: clear with random color
2009-01-14 20:33:06 +00:00
Brian Paul
fae9604727
glsl: propagate pragma info down into compiler from preprocessor
2009-01-14 12:16:00 -07:00
Brian Paul
aac4a0509e
windows: remove reference to swizzle.c file
2009-01-14 12:07:25 -07:00
Brian Paul
b5f89e5f17
glsl: simplify IR storage for samplers
...
Don't overload the Size field with the texture target, to avoid confusion.
2009-01-14 11:58:45 -07:00
Brian Paul
c12d24b513
mesa: fix incorrect transformation of GL_SPOT_DIRECTION
...
This was changed between GL 1.0 and 1.1. Mesa still had the 1.0 behaviour.
2009-01-14 11:51:30 -07:00
Ian Romanick
2549c26a8b
Treat image units and coordinate units differently.
...
Previously MaxTextureUnits was used to validate both texture image
units and texture coordinate units in fragment programs. Instead, use
MaxTextureCoordUnits for texture coordinate units and
MaxTextureImageUnits for texture image units.
Fixes bugzilla #19468 .
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
2009-01-14 10:09:01 -08:00
Alan Hourihane
e82784559e
mesa: add new samplers_array test
2009-01-14 17:01:16 +00:00
Alan Hourihane
85dfed93fe
mesa: handle some cases of 0x0 render targets
2009-01-14 16:53:22 +00:00
Alan Hourihane
a98dccca36
glsl: fix regression from sampler arrays commit
2009-01-14 16:34:19 +00:00
Alan Hourihane
1d376ae7c9
glsl: fix regression from sampler arrays commit
2009-01-14 16:32:44 +00:00
Brian Paul
1b3e3e6b84
i965: indentation fixes
2009-01-14 08:34:07 -07:00
Brian Paul
49b53407c7
i965: allow larger AA points on fallback path
2009-01-14 08:34:06 -07:00
Brian Paul
d911e3e24f
i965: fix indentation
2009-01-14 08:34:06 -07:00
Brian Paul
658ab3c3ae
i965: comment for emit_kil()
2009-01-14 08:34:06 -07:00
Brian Paul
8f7349dbb4
mesa: put _NV suffix on a few opcodes
2009-01-14 08:34:06 -07:00
Brian Paul
d687476edd
i965: fix indentation
2009-01-14 08:34:06 -07:00
Alan Hourihane
3ef419f4a5
egl: fix makecurrent with null drawable/context
2009-01-14 11:58:06 +00:00
José Fonseca
d96c89e579
gallium: Disable memory debugging for Windows OGL.
...
Unfortunately both Mesa and Gallium use the same defines for memory
allocation (MALLOC, FREE, etc), and worse, some times memory is allocated
with one set and freed with the other set, causing the homegrown memory
debugger to trip on itself.
In the future mesa and gallium should use different names, but for now,
memory debugging on Windows will have to be carried with different tools..
2009-01-14 11:40:32 +00:00
José Fonseca
eb1f01a9d9
progs: List tri-clear.
2009-01-14 11:40:31 +00:00
José Fonseca
83155aa11f
scons: Use .a suffix for MinGW.
...
This allows to build MinGW and MSVC within the same dir.
2009-01-14 11:40:31 +00:00
Jakob Bornecrantz
529f86fb11
intel: Add a none working GEM backend for intel
2009-01-14 12:28:31 +01:00
Dave Airlie
47e3a7d794
radeon: get ctx right in copybuffer
2009-01-14 15:54:28 +10:00
Dave Airlie
4aa874c636
r200: add missing symbols
2009-01-14 15:48:02 +10:00