Ben Skeggs [Sun, 22 Jun 2008 14:14:21 +0000 (00:14 +1000)]
nouveau: update for interface changes + hack around gallium x86_64 bustage
Ben Skeggs [Sun, 22 Jun 2008 14:01:17 +0000 (00:01 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/default
Keith Whitwell [Sun, 22 Jun 2008 12:14:29 +0000 (13:14 +0100)]
draw: fix non-i386 builds
Patrice Mandin [Sat, 21 Jun 2008 20:59:05 +0000 (22:59 +0200)]
Update for extra vertex attributes
Patrice Mandin [Sat, 21 Jun 2008 10:03:05 +0000 (12:03 +0200)]
nv30: Add state for blend
Patrice Mandin [Sat, 21 Jun 2008 08:11:37 +0000 (10:11 +0200)]
nv30: Update nouveau_class.h to get its proper defines instead of using nv40 ones
Brian [Sat, 21 Jun 2008 00:29:23 +0000 (18:29 -0600)]
gallium: s/feadback/feedback/, duh
Brian Paul [Fri, 20 Jun 2008 23:28:42 +0000 (17:28 -0600)]
gallium: fix invalid call to draw_set_mapped_constant_buffer()
We were indexing sp_constants[i] outside the loop so i was 2.
Replace i with PIPE_SHADER_VERTEX.
Also, replace magic '2' with PIPE_SHADER_TYPES in a few places.
Brian Paul [Fri, 20 Jun 2008 21:58:19 +0000 (15:58 -0600)]
gallium: fix some surface usage bugs
When a surface is created with GPU_WRITE that really means "GPU render"
and that can involve reads (blending). Set surface usage to
PIPE_BUFFER_USAGE_CPU_READ + WRITE. Fixes progs/demos/lodbias demo.
Also, mark texture as 'modified' when mapped for writing so that the tile
cache can know when to freshen a cached tile. Fixes glTexSubImage2D().
Brian Paul [Fri, 20 Jun 2008 20:30:21 +0000 (14:30 -0600)]
egl: added cpp assertions/sanity checks
Brian Paul [Fri, 20 Jun 2008 20:29:49 +0000 (14:29 -0600)]
mesa: init ctx->RenderMode
Brian Paul [Fri, 20 Jun 2008 20:28:59 +0000 (14:28 -0600)]
egl: added null ptr check
Patrice Mandin [Fri, 20 Jun 2008 20:19:22 +0000 (22:19 +0200)]
nv30: Add separate nv30 state stuff for fb, based on nv40 one, need to use it now
Brian Paul [Fri, 20 Jun 2008 17:49:25 +0000 (11:49 -0600)]
mesa: GL_BYTE vertex/texcoord arrays
Brian Paul [Fri, 20 Jun 2008 17:32:22 +0000 (11:32 -0600)]
mesa: initial support for fixed-pt vertex arrays
Brian Paul [Fri, 20 Jun 2008 17:31:05 +0000 (11:31 -0600)]
mesa: refactor: move initialization of DefaultPacking state.
Brian Paul [Fri, 20 Jun 2008 17:30:43 +0000 (11:30 -0600)]
gallium: always need st_init-blit()
Brian Paul [Fri, 20 Jun 2008 17:30:21 +0000 (11:30 -0600)]
gallium: remove unneeded #include
Brian Paul [Fri, 20 Jun 2008 17:15:30 +0000 (11:15 -0600)]
mesa: fix errors in prev commit
Brian Paul [Fri, 20 Jun 2008 17:05:00 +0000 (11:05 -0600)]
mesa: revamp glBlendFunc loopback
Brian Paul [Fri, 20 Jun 2008 17:04:37 +0000 (11:04 -0600)]
mesa: added _vbo_Materialfv()
Brian Paul [Fri, 20 Jun 2008 16:48:14 +0000 (10:48 -0600)]
mesa: _vbo_Color4f, _vbo_Normal3f, _vbo_MultiTexCoord4f functions
Brian Paul [Fri, 20 Jun 2008 16:47:38 +0000 (10:47 -0600)]
mesa: fix some FEATURE_x tests
Brian Paul [Fri, 20 Jun 2008 16:20:47 +0000 (10:20 -0600)]
egl: added null ptr checks
Brian Paul [Fri, 20 Jun 2008 16:20:25 +0000 (10:20 -0600)]
egl: implment EGL_LARGEST_PBUFFER query
Brian Paul [Fri, 20 Jun 2008 16:20:06 +0000 (10:20 -0600)]
egl: added null ptr check
Brian Paul [Fri, 20 Jun 2008 16:19:51 +0000 (10:19 -0600)]
egl: default API should be ES
Brian Paul [Fri, 20 Jun 2008 14:09:59 +0000 (08:09 -0600)]
gallium: assorted FEATURE tests
Brian Paul [Fri, 20 Jun 2008 14:09:46 +0000 (08:09 -0600)]
gallium: remove unneeded #include
Brian Paul [Fri, 20 Jun 2008 14:07:38 +0000 (08:07 -0600)]
mesa: test for FEATURE_ATI_fragment_shader
Brian Paul [Fri, 20 Jun 2008 03:19:33 +0000 (21:19 -0600)]
egl: fix assorted context-related bugs
Move memset() to proper place.
Added EGL_CONTEXT_CLIENT_VERSION query.
Fix bad return EGL_FALSE -> EGL_TRUE.
Brian Paul [Thu, 19 Jun 2008 22:15:56 +0000 (16:15 -0600)]
gallium: new st_api.c file with token symbol for identifying the API
Brian Paul [Thu, 19 Jun 2008 22:15:09 +0000 (16:15 -0600)]
gallium: remove unused vars
Brian Paul [Thu, 19 Jun 2008 22:12:17 +0000 (16:12 -0600)]
egl: use dlsym() to try to identify APIs
Brian Paul [Thu, 19 Jun 2008 22:06:56 +0000 (16:06 -0600)]
egl: clean up prototype code, new _eglFindAPIs() function.
Jakob Bornecrantz [Thu, 19 Jun 2008 15:09:09 +0000 (17:09 +0200)]
i915: Fixed cubemap layouts
Apprently we shouldn't do all the advanced layout
operation for none compressed formats.
The compressed code was also broken, its currently
disabled, but should be fixed once i915simple starts
to support compressed formats.
José Fonseca [Thu, 19 Jun 2008 13:57:33 +0000 (22:57 +0900)]
gallium: Handle malloc failure.
Jakob Bornecrantz [Thu, 19 Jun 2008 12:42:17 +0000 (14:42 +0200)]
i915: Refractored and clean up i915_texture.c
José Fonseca [Thu, 19 Jun 2008 12:16:16 +0000 (21:16 +0900)]
gallium: Add extra parenthesis as advised by gcc.
Michal Krol [Thu, 19 Jun 2008 12:06:28 +0000 (14:06 +0200)]
util: Add missing format names.
José Fonseca [Thu, 12 Jun 2008 14:34:21 +0000 (23:34 +0900)]
draw: Fix MSVC integer size conversion warning.
José Fonseca [Thu, 12 Jun 2008 13:19:17 +0000 (22:19 +0900)]
Parse the section:offset instead of the rva+base when reading mapfiles.
Brian Paul [Wed, 18 Jun 2008 21:08:19 +0000 (15:08 -0600)]
gallium: additional fixes to ensure even number of vertices per buffer
Brian Paul [Wed, 18 Jun 2008 20:50:35 +0000 (14:50 -0600)]
gallium: split long prims into chunks with an even number of vertices
This fixes culling "parity" errors when splitting long tri strips. Splitting
strips into chunks with an odd number of vertices causes front/back-face
orientation to get reversed and upsets culling.
Brian Paul [Wed, 18 Jun 2008 17:43:06 +0000 (19:43 +0200)]
mesa: Fix bug in _mesa_swizzle_ubyte_image
Jakob Bornecrantz [Wed, 18 Jun 2008 16:35:11 +0000 (18:35 +0200)]
tests: Added a test for a strange bug in texstore_a8
Brian Paul [Wed, 18 Jun 2008 17:00:43 +0000 (11:00 -0600)]
mesa: add fwd decl of fill_in_entrypoint_offset()
Brian Paul [Wed, 18 Jun 2008 16:20:13 +0000 (10:20 -0600)]
gallium: added new st_set_framebuffer_surface()
This allows the winsys to explicitly specify gallium surfaces for a
framebuffer object.
Brian Paul [Wed, 18 Jun 2008 15:30:13 +0000 (09:30 -0600)]
mesa: fix ReadBuffer initialization
Brian Paul [Wed, 18 Jun 2008 15:21:28 +0000 (09:21 -0600)]
egl: use RTLD_LAZY
Brian Paul [Wed, 18 Jun 2008 15:21:09 +0000 (09:21 -0600)]
egl: omit libmesa.a glapi.c from library
Brian Paul [Tue, 17 Jun 2008 22:58:22 +0000 (16:58 -0600)]
gallium: remove duplicated u_mm.c in file list
Brian Paul [Tue, 17 Jun 2008 22:57:02 +0000 (16:57 -0600)]
gallium: more FEATURE_x tests
Brian Paul [Tue, 17 Jun 2008 22:56:32 +0000 (16:56 -0600)]
mesa: FEATURE_dispatch to control dispatch table usage
Brian Paul [Tue, 17 Jun 2008 20:28:07 +0000 (14:28 -0600)]
egl: call st_get_proc_address()
Brian Paul [Tue, 17 Jun 2008 20:27:36 +0000 (14:27 -0600)]
gallium: added st_get_proc_address()
Brian Paul [Tue, 17 Jun 2008 19:23:32 +0000 (13:23 -0600)]
mesa: refactor: move GetProcAddress code from glapi.c into new glapi_getproc.c file
Brian Paul [Tue, 17 Jun 2008 19:13:34 +0000 (13:13 -0600)]
gallium: added FEATURE_x tests
Brian Paul [Tue, 17 Jun 2008 17:31:45 +0000 (11:31 -0600)]
mesa: s/GL_POLYGON+1/PRIM_OUTSIDE_BEGIN_END/
Brian Paul [Tue, 17 Jun 2008 17:29:59 +0000 (11:29 -0600)]
mesa: add parenthesis
Jakob Bornecrantz [Wed, 18 Jun 2008 09:38:12 +0000 (11:38 +0200)]
mesa: _mesa_texstore_s8_z24 now supports depth only uploads
Michal Krol [Wed, 18 Jun 2008 06:51:38 +0000 (08:51 +0200)]
gallium: Remove PIPE_FORMAT_A8UB8UG8SR8S_NORM definition.
Jakob Bornecrantz [Tue, 17 Jun 2008 23:45:21 +0000 (01:45 +0200)]
i915: Fix for s8_z24 textures not being shown
Jakob Bornecrantz [Tue, 17 Jun 2008 23:39:46 +0000 (01:39 +0200)]
mesa: Added _mesa_texstore_s8_z24
Brian Paul [Tue, 17 Jun 2008 22:43:48 +0000 (16:43 -0600)]
mesa: fix inconsistent use of GL_UNSIGNED_INT vs. GL_UNSIGNED_INT_24_8_EXT for Z unpacking
Michal Krol [Tue, 17 Jun 2008 19:43:41 +0000 (21:43 +0200)]
gallium: Add facilities for mixed pipe formats.
Brian Paul [Tue, 17 Jun 2008 18:20:22 +0000 (12:20 -0600)]
gallium: need to flush bitmap cache when raster color changes
Brian Paul [Tue, 17 Jun 2008 16:28:00 +0000 (10:28 -0600)]
gallium: check if sampler->max_lod < sampler->min_lod
Brian Paul [Tue, 17 Jun 2008 16:11:53 +0000 (10:11 -0600)]
mesa: make mm.c use unsigned ints for offsets.
If you have a GPU using this code and it has the offsets up in this space,
this fails.
cherry-picked from master
Jakob Bornecrantz [Tue, 17 Jun 2008 15:46:45 +0000 (17:46 +0200)]
i915: Made region pool a slabpool
Jakob Bornecrantz [Tue, 17 Jun 2008 13:47:01 +0000 (15:47 +0200)]
i915: Max and Min lod now works
seventh guardian [Mon, 16 Jun 2008 21:10:14 +0000 (15:10 -0600)]
added ARCH_FLAGS
Jakob Bornecrantz [Mon, 16 Jun 2008 10:20:17 +0000 (12:20 +0200)]
git: Updated .gitignore files
Michal Krol [Fri, 13 Jun 2008 15:22:11 +0000 (17:22 +0200)]
util: Use pf_get_size().
Brian Paul [Fri, 13 Jun 2008 22:45:15 +0000 (16:45 -0600)]
mesa: move some glapi bits around
Move _glapi_proc typedef from glapitable.h to glapi.h
Also, don't include glapitable.h from glapi.h
Before we were including the huge glapitable.h file in every .c file.
Brian Paul [Fri, 13 Jun 2008 20:13:25 +0000 (14:13 -0600)]
mesa: remove some temp debug code
Brian Paul [Fri, 13 Jun 2008 19:56:53 +0000 (13:56 -0600)]
mesa: check FEATURE_ARB_occlusion_query
Brian Paul [Fri, 13 Jun 2008 19:56:31 +0000 (13:56 -0600)]
egl: added a debug msg
Jakob Bornecrantz [Fri, 13 Jun 2008 18:46:14 +0000 (20:46 +0200)]
i915: Improved the not used tile code
Jakob Bornecrantz [Fri, 13 Jun 2008 17:18:56 +0000 (19:18 +0200)]
trivial: Update clear-undefined
Jakob Bornecrantz [Fri, 13 Jun 2008 17:13:35 +0000 (19:13 +0200)]
mesa: Fix libglapi.a build for dri
Jakob Bornecrantz [Fri, 13 Jun 2008 17:07:29 +0000 (19:07 +0200)]
i915: Fix offsets not being used for surface targets
Jakob Bornecrantz [Fri, 13 Jun 2008 17:03:51 +0000 (19:03 +0200)]
i915: Fix most of the clear problems
trivial/clear-undefined still fails
Jakob Bornecrantz [Fri, 13 Jun 2008 15:42:44 +0000 (17:42 +0200)]
trival: Added test for undefined context of buffer
Brian Paul [Fri, 13 Jun 2008 15:15:07 +0000 (09:15 -0600)]
gallium: another attempt at fixing libglapi.a compilation for DRI builds
If building for DRI, make a dummy/empty libglapi.a for now.
Brian Paul [Fri, 13 Jun 2008 15:10:09 +0000 (09:10 -0600)]
mesa: fix typo: s/stacks/stack/
Michal Krol [Fri, 13 Jun 2008 13:21:11 +0000 (15:21 +0200)]
gallium: Fix PIPE_FORMAT_A2B10G10R10_UNORM definition.
Whoops!
Michal Krol [Fri, 13 Jun 2008 12:58:24 +0000 (14:58 +0200)]
gallium: Add PIPE_FORMAT_A2B10G10R10_UNORM.
Michal Krol [Fri, 13 Jun 2008 12:50:29 +0000 (14:50 +0200)]
gallium: Allow pipe format component sizes to be specified
with finer granularity.
This will allow us to define A2R10G10B10 format.
Michal Krol [Fri, 13 Jun 2008 12:49:04 +0000 (14:49 +0200)]
mesa: Remove duplicate code.
Jakob Bornecrantz [Fri, 13 Jun 2008 12:11:20 +0000 (14:11 +0200)]
i915: Messed up lineloop now works
Jakob Bornecrantz [Fri, 13 Jun 2008 10:21:58 +0000 (12:21 +0200)]
i915: Support all primtive types in vbuf path
Zack Rusin [Thu, 12 Jun 2008 23:41:54 +0000 (19:41 -0400)]
silly bug: it's PROGRAM_VARYING
Zack Rusin [Thu, 12 Jun 2008 22:53:52 +0000 (18:53 -0400)]
glsl: make sure we replace all output reads with temporaries
test in if.glsl
Brian Paul [Thu, 12 Jun 2008 22:55:28 +0000 (16:55 -0600)]
mesa: add some #if FEATURE_x tests
Brian Paul [Thu, 12 Jun 2008 22:54:44 +0000 (16:54 -0600)]
gallium: add some #if FEATURE_x tests
Brian Paul [Thu, 12 Jun 2008 22:48:24 +0000 (16:48 -0600)]
mesa: remove unneeded #include
Brian Paul [Thu, 12 Jun 2008 22:37:16 +0000 (16:37 -0600)]
gallium: add missing comma
Brian Paul [Thu, 12 Jun 2008 22:01:43 +0000 (16:01 -0600)]
gallium: disable the codegen for TGSI_OPCODE_EXPBASE2 for now.
The x86 code seems to fail for exponents of 4 or larger.
See glean's vertProg1/EX2 test.
Keith Whitwell [Thu, 12 Jun 2008 22:01:05 +0000 (16:01 -0600)]
gallium: fix SSE codegen for instructions that use both a CONSTANT and IMMEDIATE
Fixes codegen for instructions like MUL dst, CONST[0], IMM[0]; the two operands
would up getting aliased in the x86/sse code.
Fixes glean/vertProg1/fogparams test.