mesa.git
15 years agomesa: regenerated gl_mange.h file
Brian Paul [Sat, 21 Feb 2009 23:01:54 +0000 (16:01 -0700)]
mesa: regenerated gl_mange.h file

15 years agomesa: use enums for TEXTURE_x_INDEX values
Brian Paul [Sat, 21 Feb 2009 22:15:20 +0000 (15:15 -0700)]
mesa: use enums for TEXTURE_x_INDEX values

Plus, put them in the order of highest to lowest priority to simplify
the texture_override() loop.

15 years agomesa: use an array for current texture objects
Brian Paul [Sat, 21 Feb 2009 21:53:25 +0000 (14:53 -0700)]
mesa: use an array for current texture objects

Use loops to consolidate lots of texture object code.

15 years agomesa: use an array for default texture objects
Brian Paul [Sat, 21 Feb 2009 20:59:29 +0000 (13:59 -0700)]
mesa: use an array for default texture objects

Replace Default1D/2D/3D/Cube/etc with DefaultTex[TEXTURE_x_INDEX].
The same should be done with the Current1D/2D/3D/etc pointers...

15 years agomesa: re-org texgen state
Brian Paul [Sat, 21 Feb 2009 20:23:04 +0000 (13:23 -0700)]
mesa: re-org texgen state

New gl_texgen struct allows quite a bit of code reduction.

15 years agointel: Fix intelSetTexBuffer miptree leak.
Kristian Høgsberg [Fri, 13 Feb 2009 16:05:54 +0000 (11:05 -0500)]
intel: Fix intelSetTexBuffer miptree leak.

The intelImage also holds a reference to the miptree, so unref that as well.

15 years agointel: tell libdrm whether we want a cpu-ready or gpu-ready BO for regions.
Eric Anholt [Wed, 18 Feb 2009 19:34:47 +0000 (11:34 -0800)]
intel: tell libdrm whether we want a cpu-ready or gpu-ready BO for regions.

This lets us avoid allocing new buffers for renderbuffers, finalized miptrees,
and PBO-uploaded textures when there's an unreferenced but still active one
cached, while also avoiding CPU waits for batchbuffers and CPU-uploaded
textures.  The size of BOs allocated for a desktop running current GL
cairogears on i915 is cut in half with this.

Note that this means we require libdrm 2.4.5.

15 years agoi965: Fix render target read domains.
Eric Anholt [Thu, 19 Feb 2009 21:53:46 +0000 (13:53 -0800)]
i965: Fix render target read domains.

We were asking for something illegal (write_domain != 0 && read_domains !=
write_domain) because at the time of writing the region surfaces were used
for texturing occasionally as well, and we weren't really clear on the model
GEM was going to use.

This reliably triggered a kernel bug with domain handling, resulting in
oglconform mustpass.c failure.  Of course, it only became visible after
01bc4d441fd6821ad9fc20d5e9544e4e587e4ff0 cleaned up some gratuitous flushing.

15 years agogallium: use the TGSI_TEXTURE_SHADOW1D/2D/RECT texture types for TEX instructions
Brian Paul [Fri, 20 Feb 2009 21:06:25 +0000 (14:06 -0700)]
gallium: use the TGSI_TEXTURE_SHADOW1D/2D/RECT texture types for TEX instructions

These texture types were defined but never put to use.
For the time being though, the Mesa->TGSI translater isn't emitting these
targets.  See the XXX comment in map_texture_target().

15 years agoi965: use the new prog_instruction::TexShadow field
Brian Paul [Fri, 20 Feb 2009 20:50:27 +0000 (13:50 -0700)]
i965: use the new prog_instruction::TexShadow field

GLSL shadow() sampler calls are properly propogated down to the driver now.
The glean glsl1 shadow() tests work (except for the alpha channel).

15 years agoi965: check depth_mode in translate_tex_format() for MESA_FORMAT_S8_Z24
Brian Paul [Fri, 20 Feb 2009 20:48:44 +0000 (13:48 -0700)]
i965: check depth_mode in translate_tex_format() for MESA_FORMAT_S8_Z24

Note that I24X8 vs. A24X8 vs. L24X8 doesn't seem to make any difference
for texture/shadow compare, however.

15 years agoglsl: use new IR opcodes for TEX instructions with shadow comparison
Brian Paul [Fri, 20 Feb 2009 20:44:43 +0000 (13:44 -0700)]
glsl: use new IR opcodes for TEX instructions with shadow comparison

Such TEX instructions will have the TexShadow flag set.
The gl_program::ShadowSamplers field is now set in the linker.  We missed
that before.

15 years agomesa: add TexShadow field to prog_instruction
Brian Paul [Fri, 20 Feb 2009 20:42:08 +0000 (13:42 -0700)]
mesa: add TexShadow field to prog_instruction

If the instruction is TEX/TXP/TXL/etc the TexShadow field will be true if
the instruction is a texture fetch with shadow compare.

15 years agoi965: separate emit_op() and emit_tex_op() functions
Brian Paul [Fri, 20 Feb 2009 19:23:25 +0000 (12:23 -0700)]
i965: separate emit_op() and emit_tex_op() functions

15 years agomesa: freshen-up comments, move some fields in prog_instruction
Brian Paul [Fri, 20 Feb 2009 18:24:15 +0000 (11:24 -0700)]
mesa: freshen-up comments, move some fields in prog_instruction

15 years agoi965: update comment, use const qualifier
Brian Paul [Fri, 20 Feb 2009 17:49:30 +0000 (10:49 -0700)]
i965: update comment, use const qualifier

15 years agoi965: var renaming, clean-up
Brian Paul [Fri, 20 Feb 2009 17:48:52 +0000 (10:48 -0700)]
i965: var renaming, clean-up

15 years agoi965: added comment
Brian Paul [Fri, 20 Feb 2009 17:48:20 +0000 (10:48 -0700)]
i965: added comment

15 years agointel: fix datatype typo, s/GLboolean/GLuint/
Brian Paul [Fri, 20 Feb 2009 17:47:28 +0000 (10:47 -0700)]
intel: fix datatype typo, s/GLboolean/GLuint/

Fixes mysterious failures in glean glsl1 test.

15 years agoi965: additional debug output
Brian Paul [Fri, 20 Feb 2009 15:31:02 +0000 (08:31 -0700)]
i965: additional debug output

15 years agoglsl: rename GLSL texture assembly instructions to be more legible
Brian Paul [Fri, 20 Feb 2009 18:44:17 +0000 (11:44 -0700)]
glsl: rename GLSL texture assembly instructions to be more legible

15 years agoglsl: fix vec4_texp_rect IR code (need projective version)
Brian Paul [Fri, 20 Feb 2009 18:42:28 +0000 (11:42 -0700)]
glsl: fix vec4_texp_rect IR code (need projective version)

15 years agopython: More efficient blits from surfaces.
José Fonseca [Fri, 20 Feb 2009 16:50:02 +0000 (16:50 +0000)]
python: More efficient blits from surfaces.

C code instead of interpreted python code.

15 years agoutil: Use a checkboard pattern instead of asserting for unknown formats.
José Fonseca [Fri, 20 Feb 2009 16:48:45 +0000 (16:48 +0000)]
util: Use a checkboard pattern instead of asserting for unknown formats.

Useful to replay traces which use DXTC textures...

15 years agopython/interpreter: Don't do unnecessary updates.
José Fonseca [Fri, 20 Feb 2009 15:23:33 +0000 (15:23 +0000)]
python/interpreter: Don't do unnecessary updates.

15 years agopython/retrace: Verbosity level.
José Fonseca [Fri, 20 Feb 2009 15:14:15 +0000 (15:14 +0000)]
python/retrace: Verbosity level.

15 years agopython/retrace: Cope with python 2.4.x
José Fonseca [Fri, 20 Feb 2009 15:02:19 +0000 (15:02 +0000)]
python/retrace: Cope with python 2.4.x

15 years agoutil/debug: need to fflush(stderr) on windows
Keith Whitwell [Fri, 20 Feb 2009 14:27:23 +0000 (14:27 +0000)]
util/debug:  need to fflush(stderr) on windows

Hard to believe... but true.

15 years agoutil: Also output messages to stderr on windows.
José Fonseca [Fri, 20 Feb 2009 14:14:19 +0000 (14:14 +0000)]
util: Also output messages to stderr on windows.

When there is a console attached, and no debugger attached.

15 years agopython: Pass a zero offset to util_draw_vertex_buffer.
José Fonseca [Wed, 31 Dec 2008 15:03:35 +0000 (15:03 +0000)]
python: Pass a zero offset to util_draw_vertex_buffer.

15 years agowgl: Prevent null pointer reference.
José Fonseca [Fri, 20 Feb 2009 11:35:46 +0000 (11:35 +0000)]
wgl: Prevent null pointer reference.

15 years agoutil: Stack backtracing facilities.
José Fonseca [Fri, 20 Feb 2009 11:35:23 +0000 (11:35 +0000)]
util: Stack backtracing facilities.

Not much useful until we have symbol lookup.

15 years agogallium: s/GALLIUM_DRIVER_DIRS/GALLIUM_DRIVERS_DIRS/
Jakob Bornecrantz [Fri, 20 Feb 2009 11:03:18 +0000 (11:03 +0000)]
gallium: s/GALLIUM_DRIVER_DIRS/GALLIUM_DRIVERS_DIRS/

15 years agogallium: Improve recursive makefiles
Jakob Bornecrantz [Thu, 19 Feb 2009 23:50:26 +0000 (00:50 +0100)]
gallium: Improve recursive makefiles

15 years agogallium: Improve winsys dri template Makefile
Jakob Bornecrantz [Thu, 19 Feb 2009 23:47:46 +0000 (00:47 +0100)]
gallium: Improve winsys dri template Makefile

LIBNAME_EGL had to be removed since if you didn't
set it (nobody set it anyways) make would get it
confused it with the $(TOP)/lib/gallium target.

15 years agointel: Use new makefile template for drm gem
Jakob Bornecrantz [Thu, 19 Feb 2009 23:23:29 +0000 (00:23 +0100)]
intel: Use new makefile template for drm gem

15 years agonouveau: Use new makefile template for drm common
Jakob Bornecrantz [Thu, 19 Feb 2009 23:22:07 +0000 (00:22 +0100)]
nouveau: Use new makefile template for drm common

15 years agogallium: Improve makefiles for libraries
Jakob Bornecrantz [Thu, 19 Feb 2009 23:14:00 +0000 (00:14 +0100)]
gallium: Improve makefiles for libraries

The template makefile that most libraries in
gallium included was based on dri and had a bunch
unrelevant junk in it.

Update it and improve the depending makefiles.

15 years agonouveau: reenable all the non-nv50 pipe drivers
Ben Skeggs [Thu, 19 Feb 2009 23:47:56 +0000 (09:47 +1000)]
nouveau: reenable all the non-nv50 pipe drivers

They still won't build yet, but anyway..

15 years agonv50: remove unused variable
Ben Skeggs [Thu, 19 Feb 2009 23:39:13 +0000 (09:39 +1000)]
nv50: remove unused variable

15 years agonv50: fix occlusion queries
Ben Skeggs [Thu, 19 Feb 2009 23:38:06 +0000 (09:38 +1000)]
nv50: fix occlusion queries

Left behind from some gallium changes a while back..

15 years agonv50: rework for texture_transfer changes
Ben Skeggs [Thu, 19 Feb 2009 23:32:47 +0000 (09:32 +1000)]
nv50: rework for texture_transfer changes

15 years agogallium: Renable pipe drivers disabled during vbuf changes
Jakob Bornecrantz [Thu, 19 Feb 2009 22:15:28 +0000 (23:15 +0100)]
gallium: Renable pipe drivers disabled during vbuf changes

i965simple is not enabled because it is still broken.

15 years agotrival: Make the last of progs show the name
Jakob Bornecrantz [Thu, 19 Feb 2009 21:48:21 +0000 (22:48 +0100)]
trival: Make the last of progs show the name

15 years agomesa: support GL_EXT_stencil_two_side in gallium/mesa state tracker
Brian Paul [Thu, 19 Feb 2009 21:37:43 +0000 (14:37 -0700)]
mesa: support GL_EXT_stencil_two_side in gallium/mesa state tracker

Since Ian's patch of a few weeks ago, we can enable all three variations
of two-sided stencil.  Update the state tracker to handle the extra back-
face state and turn on the EXT.

Note: there's a new Glean test for two-sided stencil now...

15 years agomesa: fix/update/restore comments related to two-sided stencil
Brian Paul [Thu, 19 Feb 2009 21:36:58 +0000 (14:36 -0700)]
mesa: fix/update/restore comments related to two-sided stencil

15 years agomesa: initialize ctx->Stencil._BackFace = 1
Brian Paul [Thu, 19 Feb 2009 21:34:33 +0000 (14:34 -0700)]
mesa: initialize ctx->Stencil._BackFace = 1

Back-face stencil operations didn't work correctly because this value was
zero.  It needs to be 1 or 2.  The only place it's set otherwise is in
glEnable/Disable(GL_STENCIL_TEST_TWO_SIDE_EXT).

15 years agoutil: Support PIPE_FORMAT_Z32_FLOAT in pipe_tile_raw_to_rgba
José Fonseca [Thu, 19 Feb 2009 12:56:56 +0000 (12:56 +0000)]
util: Support PIPE_FORMAT_Z32_FLOAT in pipe_tile_raw_to_rgba

15 years agopipebuffer: Dump debugging info for fenced buffer list.
José Fonseca [Wed, 18 Feb 2009 15:12:16 +0000 (15:12 +0000)]
pipebuffer: Dump debugging info for fenced buffer list.

15 years agoscons: Produce map files for debug builds too.
José Fonseca [Wed, 18 Feb 2009 15:05:23 +0000 (15:05 +0000)]
scons: Produce map files for debug builds too.

15 years agopipebuffer: Don't retry to alloc memory block on mm.
José Fonseca [Wed, 18 Feb 2009 10:25:04 +0000 (10:25 +0000)]
pipebuffer: Don't retry to alloc memory block on mm.

It will give the same result 2nd time too, as fencing is done at a
higher level.

15 years agodraw: Reuse xmm registers.
Keith Whitwell [Tue, 17 Feb 2009 21:45:54 +0000 (21:45 +0000)]
draw: Reuse xmm registers.

15 years agodraw: Fix segfault if rast is null
Jakob Bornecrantz [Sat, 14 Feb 2009 16:48:11 +0000 (17:48 +0100)]
draw: Fix segfault if rast is null

15 years agogallium/winsys/xlib: Fix build with USE_XSHM undefined.
Michel Dänzer [Thu, 19 Feb 2009 18:52:59 +0000 (19:52 +0100)]
gallium/winsys/xlib: Fix build with USE_XSHM undefined.

15 years agowgl: debug_printf in the main entry/exit points
José Fonseca [Thu, 19 Feb 2009 13:15:25 +0000 (13:15 +0000)]
wgl: debug_printf in the main entry/exit points

15 years agomesa: Free the util shaders with the gallium's FREE.
José Fonseca [Thu, 19 Feb 2009 13:02:47 +0000 (13:02 +0000)]
mesa: Free the util shaders with the gallium's FREE.

15 years agowgl: Call pipe_screen::destroy on exit.
José Fonseca [Thu, 19 Feb 2009 12:58:00 +0000 (12:58 +0000)]
wgl: Call pipe_screen::destroy on exit.

15 years agoegl: glx updates for FBconfigs
Alan Hourihane [Thu, 19 Feb 2009 13:07:37 +0000 (13:07 +0000)]
egl: glx updates for FBconfigs

15 years agoegl: if a surface type isn't defined let's default to EGL_WINDOW_BIT
Alan Hourihane [Thu, 19 Feb 2009 13:07:10 +0000 (13:07 +0000)]
egl: if a surface type isn't defined let's default to EGL_WINDOW_BIT

15 years agotrivial: Add quadstrip-clip
Jakob Bornecrantz [Sat, 14 Feb 2009 08:39:52 +0000 (09:39 +0100)]
trivial: Add quadstrip-clip

15 years agoegl: error checking
Alan Hourihane [Thu, 19 Feb 2009 11:01:01 +0000 (11:01 +0000)]
egl: error checking

15 years agowgl: Use a separate .DEF for MinGW
José Fonseca [Thu, 19 Feb 2009 10:57:11 +0000 (10:57 +0000)]
wgl: Use a separate .DEF for MinGW

gnu linker fails to resolve the @n symbols, unless:
- they are listed verbatim in the .def
- they are already linked.

And mingw's .def parser is slightly incompatible with MSVC in respect with
underscores. Will try to work with upstream to fix this, but for now there
is no option other to use seperate .def for mingw.

15 years agowgl: Share more code between icd and standalone driver.
José Fonseca [Thu, 19 Feb 2009 10:52:08 +0000 (10:52 +0000)]
wgl: Share more code between icd and standalone driver.

15 years agogdi: Update for texture/surface interface changes.
José Fonseca [Wed, 18 Feb 2009 17:58:42 +0000 (17:58 +0000)]
gdi: Update for texture/surface interface changes.

15 years agoutil: Use right include.
José Fonseca [Wed, 18 Feb 2009 17:42:55 +0000 (17:42 +0000)]
util: Use right include.

15 years agoprogs: Make fp-tri use glew and add scons target
Jakob Bornecrantz [Sat, 14 Feb 2009 00:05:13 +0000 (01:05 +0100)]
progs: Make fp-tri use glew and add scons target

15 years agocell: patch up cell_texture.c so it compiles
Brian Paul [Thu, 19 Feb 2009 04:50:20 +0000 (21:50 -0700)]
cell: patch up cell_texture.c so it compiles

Start adding some new pipe_transfer code.

Texturing is totally broken at this point but non-texture programs
seem to run OK.

15 years agocell: updates for new pipe_transfer changes
Brian Paul [Thu, 19 Feb 2009 04:46:12 +0000 (21:46 -0700)]
cell: updates for new pipe_transfer changes

Update framebuffer color/z/stencil mapping/unmapping.

15 years agocell: update vbuf code to catch up to recent changes
Brian Paul [Thu, 19 Feb 2009 04:38:53 +0000 (21:38 -0700)]
cell: update vbuf code to catch up to recent changes

15 years agocell: remove unused var
Brian Paul [Thu, 19 Feb 2009 04:38:17 +0000 (21:38 -0700)]
cell: remove unused var

15 years agocell: start adding new cell_transfer types/code
Brian Paul [Thu, 19 Feb 2009 04:36:29 +0000 (21:36 -0700)]
cell: start adding new cell_transfer types/code

15 years agocell: remove old surface_map code
Brian Paul [Thu, 19 Feb 2009 04:35:56 +0000 (21:35 -0700)]
cell: remove old surface_map code

15 years agomesa: convert VERT_RESULT_* from #defines to enum, like the others
Brian Paul [Thu, 19 Feb 2009 00:50:24 +0000 (17:50 -0700)]
mesa: convert VERT_RESULT_* from #defines to enum, like the others

15 years agoglsl: asst improvements, clean-ups in set_program_uniform()
Brian Paul [Thu, 19 Feb 2009 00:46:00 +0000 (17:46 -0700)]
glsl: asst improvements, clean-ups in set_program_uniform()

Move the is_boolean/integer_type() calls out of the loops.
Move the is_sampler_type() function near the bool/int functions.
Add a bunch of comments.

15 years agoglsl: fix inequality in set_program_uniform()
Brian Paul [Thu, 19 Feb 2009 00:40:44 +0000 (17:40 -0700)]
glsl: fix inequality in set_program_uniform()

We were off by one when checking for too many uniform values.

15 years agogallium/winsys/egl_xlib: Fix build after introduction of struct pipe_transfer.
Michel Dänzer [Wed, 18 Feb 2009 22:39:36 +0000 (23:39 +0100)]
gallium/winsys/egl_xlib: Fix build after introduction of struct pipe_transfer.

15 years agomesa: bump gl.h version comment to 7.7 (bug 20170)
Brian Paul [Wed, 18 Feb 2009 22:38:10 +0000 (15:38 -0700)]
mesa: bump gl.h version comment to 7.7 (bug 20170)

15 years agor300-gallium: implement simple pipe_transfer Basically make the driver compile and...
Joakim Sindholt [Wed, 18 Feb 2009 19:32:40 +0000 (20:32 +0100)]
r300-gallium: implement simple pipe_transfer Basically make the driver compile and behave like it did before the gallium-texture-transfer merge

15 years agoglsl: fix link failure for variable-indexed varying output arrays
Brian Paul [Wed, 18 Feb 2009 21:24:14 +0000 (14:24 -0700)]
glsl: fix link failure for variable-indexed varying output arrays

If the vertex shader writes to a varying array with a variable index,
mark all the elements of that array as being written.

For example, if the vertex shader does:

   for (i = 0; i < 4; i++)
      gl_TexCoord[i] = expr;

Mark all texcoord outputs as being written, not just the first.

Linking will fail if a fragment shader tries to read an input that's not
written by the vertex shader.  Before this fix, this linker test could fail.

15 years agoswrast: Set vp_override flag during DrawPixels
Nicolai Haehnle [Sun, 15 Feb 2009 12:34:43 +0000 (13:34 +0100)]
swrast: Set vp_override flag during DrawPixels

Obviously, the color of fragments produced by DrawPixels is not constant,
even if the current vertex array / vertex program state indicates that the
color for normal rendering will be constant. Therefore, we need to override
certain optimisations that have been added to texenvprogram.c

Signed-off-by: Nicolai Haehnle <nhaehnle@gmail.com>
15 years agomesa: improved error msg
Brian Paul [Wed, 18 Feb 2009 20:28:12 +0000 (13:28 -0700)]
mesa: improved error msg

15 years agomesa: increase MAX_UNIFORMS to 1024 (of vec4 type)
Brian Paul [Wed, 18 Feb 2009 18:47:40 +0000 (11:47 -0700)]
mesa: increase MAX_UNIFORMS to 1024 (of vec4 type)

Old limit was 256.  Note that no arrays are declared to this size.
The only place we have to be careful about raising this limit is the
prog_src/dst_register Index bitfields.  These have been bumped up too.

Added assertions to check we don't exceed the bitfield in the future too.

15 years agoglsl: fix a swizzle-related regression
Brian Paul [Wed, 18 Feb 2009 18:06:57 +0000 (11:06 -0700)]
glsl: fix a swizzle-related regression

This new issue was exposed by commit 6eabfc27f19a10dfc2663e99f9560966ba1ff697

15 years agoprogs/trivial: Label program windows with actual program name
Keith Whitwell [Wed, 18 Feb 2009 18:20:50 +0000 (18:20 +0000)]
progs/trivial:  Label program windows with actual program name

Each of these programs previously called itself "First Tri" which was a
little confusing.  Could have left one as "First Tri", but the trouble
then is that people would still clone that file & we'd end up with
another thousand first tri apps...

15 years agogallium: Also disable i965simple for scons
Jakob Bornecrantz [Wed, 18 Feb 2009 17:12:18 +0000 (17:12 +0000)]
gallium: Also disable i965simple for scons

Please read previous commit for more info.

15 years agogallium: Disable i965simple pipe driver after it was broken
Jakob Bornecrantz [Wed, 18 Feb 2009 16:58:24 +0000 (16:58 +0000)]
gallium: Disable i965simple pipe driver after it was broken

It is only the i965simple pipe driver that was broken
in the gallium-texture-transfere merge that is being
disabled, mothing more nothing less.

FYI, there never where working i965 hardware support
in gallium anyways.

15 years agogallium: Fix up trace driver for introduction of struct pipe_transfer.
Michel Dänzer [Wed, 18 Feb 2009 17:13:44 +0000 (18:13 +0100)]
gallium: Fix up trace driver for introduction of struct pipe_transfer.

15 years agogallium: Add pipe_transfer_reference().
Michel Dänzer [Wed, 18 Feb 2009 17:12:31 +0000 (18:12 +0100)]
gallium: Add pipe_transfer_reference().

15 years agoMerge branch 'gallium-texture-transfer'
Michel Dänzer [Wed, 18 Feb 2009 15:43:02 +0000 (16:43 +0100)]
Merge branch 'gallium-texture-transfer'

Conflicts:
src/gallium/drivers/softpipe/sp_tile_cache.c

15 years agoMerge commit 'origin/gallium-0.1'
Keith Whitwell [Wed, 18 Feb 2009 15:14:39 +0000 (15:14 +0000)]
Merge commit 'origin/gallium-0.1'

Conflicts:

src/gallium/auxiliary/draw/draw_vs_aos.c

15 years agor300-gallium: Factor out common functionality in vbuf emit.
Corbin Simpson [Wed, 18 Feb 2009 14:38:21 +0000 (06:38 -0800)]
r300-gallium: Factor out common functionality in vbuf emit.

15 years agoi915simple: Minimal fixup for introduction of struct pipe_transfer.
Michel Dänzer [Wed, 18 Feb 2009 12:14:02 +0000 (13:14 +0100)]
i915simple: Minimal fixup for introduction of struct pipe_transfer.

15 years agogallium: fix merge
Keith Whitwell [Mon, 16 Feb 2009 20:19:40 +0000 (20:19 +0000)]
gallium: fix merge

It looks like I resolved the merge conflicts but did not save my emacs
buffers before committing...

15 years agoMerge branch 'master' into gallium-texture-transfer
Keith Whitwell [Mon, 16 Feb 2009 19:50:48 +0000 (19:50 +0000)]
Merge branch 'master' into gallium-texture-transfer

Conflicts:

src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_drawpixels.c

15 years agomesa: remove old comments
Brian Paul [Mon, 16 Feb 2009 18:50:05 +0000 (11:50 -0700)]
mesa: remove old comments

Note: the default value for EmitCondCodes is FALSE.  This means the GLSL
compiler will emit code like this:

SEQ TEMP[0].x, A, B;
IF TEMP[0].x;
   ...
ENDIF

But if EmitCondCodes is TRUE, condition codes will be used instead:

SEQ.C TEMP[0].x, A, B;
IF (NE.xxxx);
   ...
ENDIF

15 years agoi965: tell GLSL compiler to emit code using condition codes
Brian Paul [Mon, 16 Feb 2009 18:45:57 +0000 (11:45 -0700)]
i965: tell GLSL compiler to emit code using condition codes

The default for EmitCondCodes got flipped when gallium-0.2 was merged.
This fixes GLSL if/else/endif regressions.
Drivers that use GLSL should always explicitly set the flag to be safe.

15 years agonouveau: oops :-)
Patrice Mandin [Mon, 16 Feb 2009 17:43:56 +0000 (18:43 +0100)]
nouveau: oops :-)

15 years agoautoconf: Always enable glew
Dan Nicholson [Mon, 16 Feb 2009 17:28:35 +0000 (09:28 -0800)]
autoconf: Always enable glew

Maybe this should turn into an option (--disable-glew), but for now just
enable glew all the time.

15 years agoglsl: silence some uninit var warnings
Brian Paul [Mon, 16 Feb 2009 15:25:57 +0000 (08:25 -0700)]
glsl: silence some uninit var warnings

15 years agocell: use some SPU intrinsics to get slightly better code in eval_inputs()
Brian Paul [Mon, 16 Feb 2009 15:25:33 +0000 (08:25 -0700)]
cell: use some SPU intrinsics to get slightly better code in eval_inputs()

Suggested by Jonathan Adamczewski.  There may be more places to do this...