Ben Skeggs [Thu, 10 Jul 2008 14:05:53 +0000 (00:05 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Brian Paul [Wed, 9 Jul 2008 21:54:21 +0000 (15:54 -0600)]
mesa: check for null shader->Source
Brian Paul [Wed, 9 Jul 2008 21:08:39 +0000 (15:08 -0600)]
mesa: return -1, not GL_FALSE if _glapi_add_dispatch() fails name sanity check
Brian Paul [Wed, 9 Jul 2008 21:52:04 +0000 (15:52 -0600)]
mesa: call glutDestroyWindow() on exit
Brian Paul [Wed, 9 Jul 2008 21:51:18 +0000 (15:51 -0600)]
mesa: disable fprintf() error
Brian Paul [Wed, 9 Jul 2008 21:49:59 +0000 (15:49 -0600)]
egl: link libEGL w/ additional libs
Brian Paul [Wed, 9 Jul 2008 21:47:27 +0000 (15:47 -0600)]
egl: misc updates/fixes
Set surface size when created.
Implement dri_find_dri_screen().
Look for "egl_xxx_dri.so" library before regular DRI driver.
Patrice Mandin [Wed, 9 Jul 2008 21:23:39 +0000 (23:23 +0200)]
nv30: min/max lod are used for mipmap, there is just enable bit in tx_format
Patrice Mandin [Wed, 9 Jul 2008 20:13:01 +0000 (22:13 +0200)]
nv30: Update defines from nouveau_class.h
Patrice Mandin [Wed, 9 Jul 2008 20:03:59 +0000 (22:03 +0200)]
nv30: Update defines from nouveau_class.h
Patrice Mandin [Wed, 9 Jul 2008 19:51:22 +0000 (21:51 +0200)]
nv30: update nouveau_class.h
Brian Paul [Wed, 9 Jul 2008 17:46:16 +0000 (11:46 -0600)]
gallium: fix logic in pb_check_usage()
Brian Paul [Wed, 9 Jul 2008 14:48:41 +0000 (08:48 -0600)]
mesa: check for OpenBSD (bug 15604)
cherry-picked from master
Brian Paul [Wed, 9 Jul 2008 14:47:23 +0000 (08:47 -0600)]
mesa: fix state.clip[n].plane parsing bug (bug 16611)
cherry-picked from master
Zack Rusin [Wed, 9 Jul 2008 14:20:28 +0000 (10:20 -0400)]
egl: plug a small memleak
Zack Rusin [Wed, 9 Jul 2008 13:29:49 +0000 (09:29 -0400)]
draw: remove some debug output
Brian Paul [Tue, 8 Jul 2008 22:58:50 +0000 (16:58 -0600)]
mesa: remove debug code
Brian Paul [Tue, 8 Jul 2008 22:12:01 +0000 (16:12 -0600)]
mesa: implement glGetUniformiv() with new ctx->Driver function
The old implementation could overwrite the caller's param buffer.
Brian Paul [Tue, 8 Jul 2008 21:04:47 +0000 (15:04 -0600)]
mesa: fix bug/failure in recursive function inlining
Fixes a failure for cases such as y = f(a, f(a, b))
All the usual tests still pass but regressions are possible...
Brian Paul [Tue, 8 Jul 2008 21:00:11 +0000 (15:00 -0600)]
gallium: tweak printing of generic declarations
Brian Paul [Tue, 8 Jul 2008 20:59:31 +0000 (14:59 -0600)]
mesa: more debug output
Brian Paul [Tue, 8 Jul 2008 19:05:43 +0000 (13:05 -0600)]
mesa: compute global var size before doing codegen
Brian Paul [Tue, 8 Jul 2008 19:02:33 +0000 (13:02 -0600)]
mesa: add missing VARYING case to storage_string()
Stephane Marchesin [Tue, 8 Jul 2008 18:26:04 +0000 (20:26 +0200)]
nv10: use the gallium alloc/free wrappers.
Stephane Marchesin [Tue, 8 Jul 2008 18:06:57 +0000 (20:06 +0200)]
nv04: use FREE/MALLOC like a good gallium boy should.
Jakob Bornecrantz [Tue, 8 Jul 2008 14:54:22 +0000 (16:54 +0200)]
i915: Takedown EGL screen
Stephane Marchesin [Tue, 8 Jul 2008 14:38:55 +0000 (16:38 +0200)]
Merge branch 'gallium-0.1' of git+ssh://marcheu@git.freedesktop.org/git/nouveau/mesa into gallium-0.1
Stephane Marchesin [Tue, 8 Jul 2008 14:38:27 +0000 (16:38 +0200)]
nv30: use native instructions.
Jakob Bornecrantz [Tue, 8 Jul 2008 12:44:23 +0000 (14:44 +0200)]
i915: Use deviceID in EGL device create
Jakob Bornecrantz [Tue, 8 Jul 2008 12:41:17 +0000 (14:41 +0200)]
i915: Complete the screen -> device renaming
Jakob Bornecrantz [Tue, 8 Jul 2008 12:16:15 +0000 (14:16 +0200)]
i915: Renamed intel_screen to intel_device
The renameing makes more sense, why because:
In egl you have a display/driver/device as the
basis, and you have screens as outputs.
Ben Skeggs [Tue, 8 Jul 2008 02:51:29 +0000 (12:51 +1000)]
nv50: make use of nouveau drm 0.0.11 to get 3d going
Jonathan White [Mon, 7 Jul 2008 23:56:29 +0000 (17:56 -0600)]
mesa: added GLAPIENTRY keywords
Jonathan White [Mon, 7 Jul 2008 23:56:09 +0000 (17:56 -0600)]
egl: updated GL_APIENTRY for Windows
Stephane Marchesin [Mon, 7 Jul 2008 23:34:36 +0000 (01:34 +0200)]
nv10: there are no 3D textures.
Stephane Marchesin [Mon, 7 Jul 2008 23:32:32 +0000 (01:32 +0200)]
nv04: Hook the lib into the build.
Stephane Marchesin [Mon, 7 Jul 2008 23:30:48 +0000 (01:30 +0200)]
nv04: use BEGIN_RING_NI
Stephane Marchesin [Mon, 7 Jul 2008 23:06:18 +0000 (01:06 +0200)]
nv04.
José Fonseca [Mon, 7 Jul 2008 10:35:23 +0000 (19:35 +0900)]
raw2png: More helpful messages. Handle PIPE_FORMAT_A8B8G8R8_SNORM.
José Fonseca [Mon, 7 Jul 2008 10:29:24 +0000 (19:29 +0900)]
raw2png: Update formats from p_formats.h
Brian Paul [Mon, 7 Jul 2008 20:34:30 +0000 (14:34 -0600)]
egl: bump up MAX_ATTRIBS, added assertion
Brian Paul [Mon, 7 Jul 2008 16:12:55 +0000 (10:12 -0600)]
gallium: move assertion (though not really significant)
Brian Paul [Mon, 7 Jul 2008 16:08:43 +0000 (10:08 -0600)]
gallium: simplify/fix buffer_offset, src_offset computation for VBO arrays
Things broke when vertex position wasn't the first attribute.
Jakob Bornecrantz [Mon, 7 Jul 2008 13:49:59 +0000 (15:49 +0200)]
i915: Fix wrong pointer to cleanup
Jakob Bornecrantz [Mon, 7 Jul 2008 13:49:09 +0000 (15:49 +0200)]
i915: Fix EGL make current
Jakob Bornecrantz [Mon, 7 Jul 2008 13:26:47 +0000 (15:26 +0200)]
i915: More cleanup of display
Jakob Bornecrantz [Mon, 7 Jul 2008 12:29:11 +0000 (14:29 +0200)]
i915: Fetch the real deviceID for EGL
Jakob Bornecrantz [Mon, 7 Jul 2008 11:24:09 +0000 (13:24 +0200)]
i915: Destruction of surface, context and device in EGL
Younes Manton [Mon, 7 Jul 2008 02:04:29 +0000 (22:04 -0400)]
g3dvl: IDCT part 1.
Very basic IDCT support is in, performed CPU-side for now.
Younes Manton [Fri, 4 Jul 2008 00:05:32 +0000 (20:05 -0400)]
g3dvl: Round surfaces up to POT, use src rect when outputting surfaces.
Jakob Bornecrantz [Sat, 5 Jul 2008 14:46:04 +0000 (16:46 +0200)]
i915: Fix EGL version and name
Jakob Bornecrantz [Sat, 5 Jul 2008 13:58:42 +0000 (15:58 +0200)]
i915: Added a intel be function to wrap a drm bo handle
Jakob Bornecrantz [Sat, 5 Jul 2008 12:04:02 +0000 (14:04 +0200)]
i915: Fix haveDepth and haveStencil for visual in EGL
José Fonseca [Fri, 4 Jul 2008 18:21:27 +0000 (03:21 +0900)]
softpipe: Prevent NULL ptr derreference on takedown.
José Fonseca [Fri, 4 Jul 2008 18:19:56 +0000 (03:19 +0900)]
softpipe: Compute block size for display targets.
Jakob Bornecrantz [Fri, 4 Jul 2008 17:23:52 +0000 (19:23 +0200)]
i915: Added debug filling code of texture, not active
Jakob Bornecrantz [Fri, 4 Jul 2008 17:20:08 +0000 (19:20 +0200)]
i915: Clean up intel_egl.c a bit
Jakob Bornecrantz [Fri, 4 Jul 2008 17:33:09 +0000 (19:33 +0200)]
egl: Add egltri
First tri for EGL drivers with mesa screen ext
Patrice Mandin [Fri, 4 Jul 2008 16:53:44 +0000 (18:53 +0200)]
nv30: Emit sampler state using state objects
Brian Paul [Fri, 4 Jul 2008 16:37:07 +0000 (10:37 -0600)]
mesa: Replace Proxy1D/2D/etc with ProxyTex[] indexed by TEXTURE_x_INDEX.
Simplification in colortab.c too.
cherry-picked from master (
fe469007037d9d5cdbe1677d8ff7368b276e9e7c)
Brian Paul [Fri, 4 Jul 2008 16:35:32 +0000 (10:35 -0600)]
gallium: fix st_choose_format(internalFormat=GL_RGBA16)
Need to check if we're choosing a surface or texture format.
Brian Paul [Fri, 4 Jul 2008 16:29:15 +0000 (10:29 -0600)]
mesa: Implement mutex/locking around texture object reference counting.
Use new _mesa_reference_texobj() function for referencing/unreferencing
textures. Add new assertions/tests to try to detect invalid usage of
deleted textures.
cherry-picked from master (
9e01b915f1243a3f551cb795b7124bd1e52ca15f)
Brian Paul [Fri, 4 Jul 2008 16:02:16 +0000 (10:02 -0600)]
gallium: replace assertion with conditional
Brian Paul [Fri, 4 Jul 2008 15:59:43 +0000 (09:59 -0600)]
gallium: fix trim() function bug when count < first
If the user called glDrawArrays(GL_TRIANGLES, count=1), trim() returned a
very large integer because of the unsigned arithmetic.
Brian Paul [Fri, 4 Jul 2008 15:58:14 +0000 (09:58 -0600)]
mesa: generate GL_INVALID_OPERATION in _mesa_get_uniform_location() if program isn't linked
Brian Paul [Fri, 4 Jul 2008 15:56:08 +0000 (09:56 -0600)]
mesa: move assertion
José Fonseca [Fri, 4 Jul 2008 15:56:36 +0000 (00:56 +0900)]
psb: Fill all texture fields when creating texture blanket.
José Fonseca [Fri, 4 Jul 2008 15:55:18 +0000 (00:55 +0900)]
softpipe: Implement texture blankets.
Ben Skeggs [Fri, 4 Jul 2008 14:53:13 +0000 (00:53 +1000)]
Merge remote branch 'upstream/gallium-0.1' into gallium-0.1
José Fonseca [Fri, 4 Jul 2008 13:27:50 +0000 (22:27 +0900)]
scons: Enable gcc SSE2 intrinsics on x86.
Brian Paul [Thu, 3 Jul 2008 22:59:24 +0000 (16:59 -0600)]
mesa: added _vbo_VertexAttrib4f()
Brian Paul [Thu, 3 Jul 2008 22:24:26 +0000 (16:24 -0600)]
mesa: fix incorrect array size, added assertion
Brian Paul [Thu, 3 Jul 2008 22:23:18 +0000 (16:23 -0600)]
mesa: fix array storage allocation bug
Brian Paul [Thu, 3 Jul 2008 22:22:49 +0000 (16:22 -0600)]
mesa: regenerated file
Brian Paul [Thu, 3 Jul 2008 22:22:36 +0000 (16:22 -0600)]
mesa: additional vec4 constructor
Brian Paul [Thu, 3 Jul 2008 22:21:15 +0000 (16:21 -0600)]
mesa: fix various error codes
Brian Paul [Thu, 3 Jul 2008 22:02:13 +0000 (16:02 -0600)]
mesa: fix some error codes in _mesa_ShaderSourceARB()
Brian Paul [Thu, 3 Jul 2008 21:41:45 +0000 (15:41 -0600)]
mesa: fix problem freeing framebuffer/renderbuffer objects
Basically, set up no-op Delete() methods for the DummyFrame/Renderbuffer obj
Brian Paul [Thu, 3 Jul 2008 20:55:14 +0000 (14:55 -0600)]
gallium: added a4r4g4b4_put_tile_rgba()
Brian Paul [Thu, 3 Jul 2008 20:12:27 +0000 (14:12 -0600)]
mesa: added case for fixed pt
Brian Paul [Thu, 3 Jul 2008 18:56:33 +0000 (12:56 -0600)]
gallium: increase TGSI interpreter's number of temp registers to 64
Also, clean up the definitions of the misc/extra temp regs.
A few new assertions too.
Brian Paul [Thu, 3 Jul 2008 16:43:14 +0000 (10:43 -0600)]
gallium: move, increase ST_MAX_SHADER_TOKENS
Brian Paul [Thu, 3 Jul 2008 16:42:31 +0000 (10:42 -0600)]
gallium: increase TGSI_EXEC_MAX_COND_NESTING, etc
Patrice Mandin [Thu, 3 Jul 2008 20:47:15 +0000 (22:47 +0200)]
nv30: Reemit state when changing context
Patrice Mandin [Thu, 3 Jul 2008 20:42:30 +0000 (22:42 +0200)]
nv30: Emit viewport state using state objects
Patrice Mandin [Thu, 3 Jul 2008 20:31:23 +0000 (22:31 +0200)]
nv30: Emit polygon stipple state using state objects
Patrice Mandin [Thu, 3 Jul 2008 20:18:38 +0000 (22:18 +0200)]
nv30: Emit scissor state using state objects
Patrice Mandin [Thu, 3 Jul 2008 20:10:53 +0000 (22:10 +0200)]
nv30: Emit depth/stencil/alpha state using state objects
Patrice Mandin [Thu, 3 Jul 2008 19:48:18 +0000 (21:48 +0200)]
nv30: Emit rasterizer state using state objects
Patrice Mandin [Thu, 3 Jul 2008 19:25:47 +0000 (21:25 +0200)]
nv30: Emit blend state using state objects
Patrice Mandin [Thu, 3 Jul 2008 19:11:07 +0000 (21:11 +0200)]
nv30: Emit blend color state using state objects
Patrice Mandin [Thu, 3 Jul 2008 18:58:31 +0000 (20:58 +0200)]
nv30: Emit framebuffer state using state objects
Brian Paul [Thu, 3 Jul 2008 16:12:00 +0000 (10:12 -0600)]
gallium: fix surface memleak in bitmap code
Found w/ tunnel2.c demo.
José Fonseca [Thu, 3 Jul 2008 12:28:56 +0000 (21:28 +0900)]
pipebuffer: Silent warnings.
Although rarely hit in normal apps, they are too noisy with test suites.
José Fonseca [Thu, 3 Jul 2008 10:55:14 +0000 (19:55 +0900)]
Support conversion of YUV surfaces.
José Fonseca [Thu, 3 Jul 2008 10:52:05 +0000 (19:52 +0900)]
gallium: Don't forget to get overllaping blits working again.
Jakob Bornecrantz [Thu, 3 Jul 2008 10:12:25 +0000 (12:12 +0200)]
i915: EGL almost works again
Jakob Bornecrantz [Thu, 3 Jul 2008 10:10:36 +0000 (12:10 +0200)]
egl: Fix demodriver
José Fonseca [Thu, 3 Jul 2008 06:02:56 +0000 (15:02 +0900)]
gallium: Use surface_copy for 1:1 blits.
José Fonseca [Thu, 3 Jul 2008 03:42:23 +0000 (12:42 +0900)]
scons: Add a env.CodeGenerate method to simplify code generation via python scripts.
env.CodeGenerate(
target = 'my_source.c',
script = 'my_generator.py',
source = ['input.txt', 'another.txt'],
command = 'python $SCRIPT $SOURCE > $TARGET'
)
It will take care generating all appropriate dependencies, including any
module imported by the generator script, and the respective .pyc file
side effects.