Alex Deucher [Fri, 17 Jul 2009 22:10:48 +0000 (18:10 -0400)]
R200: fix build when RADEON_DEBUG_BO is set
Dave Airlie [Fri, 17 Jul 2009 22:00:23 +0000 (08:00 +1000)]
radeon: disable BO debug
Brian Paul [Fri, 17 Jul 2009 19:36:06 +0000 (13:36 -0600)]
egl: commit missing eglcurrent.[ch] files
Not sure how these got left out from earlier commit.
Alex Deucher [Fri, 17 Jul 2009 18:46:40 +0000 (14:46 -0400)]
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
Kevin DeKorte [Fri, 17 Jul 2009 18:43:42 +0000 (14:43 -0400)]
R6xx/r7xx: warning fixes
patch from Kevin DeKorte with some minor fixes from me.
Chia-I Wu [Fri, 17 Jul 2009 04:21:59 +0000 (21:21 -0700)]
xeglthreads: Check current context for EGL per-thread support.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 17:56:00 +0000 (11:56 -0600)]
egl: Remove redundant DeletePending flag.
A context or surface that is neither linked to a display nor current to
a thread should be destroyed. Therefore, an unlinked context or surface
implies a pending delete automatically.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 04:21:57 +0000 (21:21 -0700)]
egl: Destroy display's resources upon termination.
eglTerminate should destroy the contexts and surfaces of the display.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 04:21:56 +0000 (21:21 -0700)]
egl: Return the same EGL Display for the same native display.
The latest revision of the spec explicitly requires the same handle to
be returned for the same native display.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 17:53:03 +0000 (11:53 -0600)]
egl: Use the link functions to manage resources.
This commit uses the newly introduced link functions to manage EGL
contexts and surfaces. As a result of this, the API for drivers are
changed. All drivers are updated for the change.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 17:48:27 +0000 (11:48 -0600)]
egl: Add funtions to link contexts and surfaces to displays.
EGL contexts and surfaces are resources of displays. They should be
managed by displays. This commit adds a bunch of functions to
egldisplay.c to help establish the links between contexts/surfaces and
displays. How links are established is considered opaque outside
display. Functions like _eglGetSurfaceHandle or _eglLookupSurface are
therefore moved to egldisplay.c, with some small modifications.
The idea is also extended to display. That is, displays need to link to
themselves to be looked up.
This commit only adds the functions. A commit to use them should
follow.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 17:42:04 +0000 (11:42 -0600)]
egl: Extend per-thread info for multiple current contexts.
EGL allows multiple current contexts, as long as they are bound to
different client APIs.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 17:41:02 +0000 (11:41 -0600)]
egl: Support per-thread info.
This commit introduces a "current" system to manage per-thread info. It
uses TLS, if GLX_USE_TLS is defined, or pthread, if PTHREADS is defined.
If none of them are defined, it uses a dummy implementation that is just
like before.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Chia-I Wu [Fri, 17 Jul 2009 04:21:51 +0000 (21:21 -0700)]
egl: Add eglcompiler.h for compiler features.
Only INLINE (from mesa/main/compiler.h) is defined now. It may be used
to deal with symbol visibility and int/pointer conversion in the future.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Alex Deucher [Fri, 17 Jul 2009 16:21:33 +0000 (12:21 -0400)]
R6xx/r7xx: disable depth/stencil compression for now
Alex Deucher [Fri, 17 Jul 2009 16:07:15 +0000 (12:07 -0400)]
R6xx/r7xx: add some missing state regs
Eric Anholt [Fri, 17 Jul 2009 01:41:03 +0000 (18:41 -0700)]
texenv: Calculate whether we need to do secondary color on our own.
The _TriangleCaps bit is deprecated, not updated when we require, and
is set based on state that hasn't been updated at that point in
_mesa_update_state_locked().
Fixes incorrect clear color in glsl/twoside.c with meta_clear_tris.
Eric Anholt [Thu, 16 Jul 2009 22:57:22 +0000 (15:57 -0700)]
i965: Add missing state dependency of sf_unit on _NEW_BUFFERS.
Alex Deucher [Thu, 16 Jul 2009 21:35:44 +0000 (17:35 -0400)]
R6xx: fix rendering on r6xx/rs780 chips
You always need to emit a fetch shader (fs) even if you
aren't using it. For now, just emit the fs with the
vs address to make the kernel happy.
Keith Whitwell [Thu, 16 Jul 2009 17:45:10 +0000 (18:45 +0100)]
draw: fix ppc build regression
Found by x.org tinderbox, reported by Chris Ball.
Kevin DeKorte [Thu, 16 Jul 2009 15:57:14 +0000 (11:57 -0400)]
Warning fixes
Alex Deucher [Thu, 16 Jul 2009 15:50:43 +0000 (11:50 -0400)]
R6xx/r7xx: remove unused function
Spotted by kdekorte on IRC
Brian Paul [Thu, 16 Jul 2009 14:44:51 +0000 (08:44 -0600)]
st/mesa: add some array index bounds assertions
Chia-I Wu [Thu, 16 Jul 2009 14:29:19 +0000 (08:29 -0600)]
egl: Add xeglthreads
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Richard Li [Thu, 16 Jul 2009 14:28:58 +0000 (10:28 -0400)]
Restore vp input mapping, fix vtx stream missing problem.
Keith Whitwell [Thu, 16 Jul 2009 11:49:27 +0000 (12:49 +0100)]
tgsi: simplify and fix sse KIL implementation
Use sse_movmskps to extract the correct bits of the comparison result
for use in updating the killmask. Simplify some logic around
identifying the set of necessary comparisons to make.
Keith Whitwell [Thu, 16 Jul 2009 11:47:11 +0000 (12:47 +0100)]
rtasm: export sse_movmskps
Keith Whitwell [Thu, 16 Jul 2009 10:01:19 +0000 (11:01 +0100)]
tgsi: initial texturing support on sse path
Most obvious problem is drawpixels comes out blocky, but this may be
an existing issue of KIL on the sse path.
Keith Whitwell [Thu, 16 Jul 2009 09:11:46 +0000 (10:11 +0100)]
tgsi: make sse function callout mechanism more generic
Take a list of arguments rather than hardcoding TEMP_R0.
Keith Whitwell [Thu, 16 Jul 2009 06:50:34 +0000 (07:50 +0100)]
tgsi: reduce x86 reg usage in tgsi_sse generated programs
Pass the tgsi_exec_machine struct in directly and just hold a single
pointer to this struct, rather than keeping one for each of its
internal members.
Keith Whitwell [Wed, 15 Jul 2009 23:23:33 +0000 (00:23 +0100)]
tgsi: no need to separately malloc input and output arrays
Can now guarantee alignment in the initial allocation of the tgsi exec machine.
Keith Whitwell [Wed, 15 Jul 2009 23:21:17 +0000 (00:21 +0100)]
gallium: reduce recursive include of tgsi_exec.h
A lot of draw code no longer needs to see this header.
Keith Whitwell [Wed, 15 Jul 2009 22:59:55 +0000 (23:59 +0100)]
tgsi: make function call code in tgsi_sse.c less opaque
Explictly pass src and dst arguments (previously dst argument was also
being used as a src). Separate argument handling from the rest of
the function call emit.
Keith Whitwell [Wed, 15 Jul 2009 22:44:53 +0000 (23:44 +0100)]
gallium: proper constructor and destructor for tgsi_exec_machine
Centralize the creation, initialization and destruction of this struct.
Use align_malloc instead of home-brew alternatives.
Alex Deucher [Thu, 16 Jul 2009 06:59:36 +0000 (02:59 -0400)]
Fix more merge fallout
Kevin DeKorte [Wed, 15 Jul 2009 21:13:09 +0000 (17:13 -0400)]
R6xx/r7xx: warning fixes
Richard Li [Wed, 15 Jul 2009 21:00:42 +0000 (17:00 -0400)]
R6xx/r7xx: fix missing vertex stream
Somehow context->radeon.tcl.aos[j].bo is not null sometimes,
but it is safe for now because it is only a pointer to
dma.current so overwriting it would not hurt anything.
Alex Deucher [Wed, 15 Jul 2009 19:59:04 +0000 (15:59 -0400)]
radeon bo: Fix merge fall out
Alex Deucher [Wed, 15 Jul 2009 19:40:35 +0000 (15:40 -0400)]
R6xx/r7xx: more Makefile fixes
Alex Deucher [Wed, 15 Jul 2009 19:23:11 +0000 (15:23 -0400)]
Fix r600 makefile for lastest CS changes
Alex Deucher [Wed, 15 Jul 2009 18:17:07 +0000 (14:17 -0400)]
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
This builds, but I get an assertion in radeonGetLock() due to
the drawable being null.
Alex Deucher [Wed, 15 Jul 2009 15:31:24 +0000 (11:31 -0400)]
make sure ctx->Driver.Flush is valid before calling it
Alex Deucher [Wed, 15 Jul 2009 15:16:41 +0000 (11:16 -0400)]
Use memcpy directly in the common code
This alleviates the need for an additional symbol.
Dave Airlie [Wed, 15 Jul 2009 03:25:32 +0000 (13:25 +1000)]
radeon: update span reading micro tile code
tested on r500 with zreaddraw with Z buffer in all 3 modes
Dave Airlie [Wed, 15 Jul 2009 03:24:30 +0000 (13:24 +1000)]
r300: emit z depth pitch reloc in preparation for tiling
Dave Airlie [Wed, 15 Jul 2009 02:03:34 +0000 (12:03 +1000)]
radeon: r300 fix span reading for macro tiled buffers.
this uses the correct formula for macro tiled buffers for readback
Dave Airlie [Wed, 8 Jul 2009 01:16:56 +0000 (11:16 +1000)]
radeon: for tiling you really need to use GET/PUT VALUE not PTR.
since the surfaces aren't linear you can't just use GET_PTR
Xiang, Haihao [Wed, 15 Jul 2009 02:40:16 +0000 (10:40 +0800)]
i965: the offset of any branch/jump instruction is in unit of 64bits on IGDNG
Alex Deucher [Wed, 15 Jul 2009 01:19:32 +0000 (21:19 -0400)]
R6xx/r7xx: implement memcpy buffer swaps
This allows double buffered apps to run, but perfomance
will be awful until we implement something faster.
You must update to the latest kernel modules.
Dave Airlie [Tue, 14 Jul 2009 23:35:09 +0000 (09:35 +1000)]
intel/radeon: add common metaops code.
Move all the metaops to a dri_metaops file and port radeon/intel
to use the new common meta ops code.
Alex Deucher [Wed, 15 Jul 2009 00:08:27 +0000 (20:08 -0400)]
r6xx/r7xx: fix buffer aging bug
We were using sparse indexing for aos, while the common
code expected packed indexing.
Alex Deucher [Wed, 15 Jul 2009 00:06:29 +0000 (20:06 -0400)]
R6xx/R7xx: no irqs yet.
Dave Airlie [Tue, 14 Jul 2009 21:10:45 +0000 (07:10 +1000)]
radeon: fix unsigned vs signed comparison in stencil code.
This function takes a GLint not a GLuint, passing in -1
breaks internally.
Eric Anholt [Tue, 14 Jul 2009 21:49:03 +0000 (14:49 -0700)]
intel: Fix ClearDepth to not be affected by DepthRange.
Fixes new piglit depthrange-clear.c test.
Eric Anholt [Tue, 14 Jul 2009 21:30:12 +0000 (14:30 -0700)]
intel: Set DepthRange in the metaops using RasterPos[2].
RasterPos[2] is already sent through the window transform, which includes
DepthRange handling. So make DepthRange for the metaops a noop.
Fixes a failure in oglconform depthrange.c
Eric Anholt [Tue, 2 Jun 2009 14:47:20 +0000 (07:47 -0700)]
Fix state flag dependencies for fixed function fragment program updates.
I started looking into why _NEW_ARRAY punishes us, and while annotating
dependencies noticed that a bunch of dependencies were missing.
Eric Anholt [Tue, 14 Jul 2009 18:51:17 +0000 (11:51 -0700)]
intel: Flag _NEW_ARRAY state when doing array object binding in clears.
This is just following bind_vertex_array()'s behavior.
Alex Deucher [Tue, 14 Jul 2009 22:01:29 +0000 (18:01 -0400)]
Disable shader dumps
Brian Paul [Tue, 14 Jul 2009 13:47:19 +0000 (07:47 -0600)]
mesa: regenerated enums.c file
Corbin Simpson [Tue, 14 Jul 2009 08:16:25 +0000 (01:16 -0700)]
dri-st: Unbreak GL_EXT_blend_equation_separate.
Since it has a dispatch table entry (for BlendEquationSeparateEXT,)
can't omit it from this list. It'll still get disabled if the cap
(PIPE_CAP_BLEND_EQUATION_SEPARATE) isn't set.
Somebody that doesn't suck at GL (read: not me) should probably add
this into progs/samples/blendeq or similar so we can test it.
Patrice Mandin [Tue, 14 Jul 2009 07:44:49 +0000 (09:44 +0200)]
gallium: Define PIPE_CAP_BLEND_EQUATION_SEPARATE, remove extension from default extension list
Michel Dänzer [Tue, 14 Jul 2009 06:25:27 +0000 (08:25 +0200)]
radeon: Differentiate 16 bpp destination formats.
Fixes those formats in fbo_firecube.
Only tested with r300, radeon and r200 compile tested only.
Michel Dänzer [Tue, 14 Jul 2009 06:00:49 +0000 (08:00 +0200)]
radeon: Invert front face winding when rendering to FBO.
Fixes fgl_glxgears and progs/demos/fbotexture after pressing 'c'.
Tested with r300, radeon and r200 compile tested only.
Cooper Yuan [Tue, 14 Jul 2009 02:39:07 +0000 (10:39 +0800)]
R6xx/r7xx: Fix specular lighting issue
Nicolai Hähnle [Mon, 13 Jul 2009 22:01:51 +0000 (15:01 -0700)]
r300g: Small compile warning fixes.
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Nicolai Hähnle [Mon, 13 Jul 2009 21:58:45 +0000 (14:58 -0700)]
r300g, radeon: Whitespace fixes.
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Corbin Simpson [Mon, 13 Jul 2009 21:47:36 +0000 (14:47 -0700)]
r300g: Use align() instead of inline maths.
Maciej Cencora [Mon, 13 Jul 2009 18:29:11 +0000 (20:29 +0200)]
Merge branch 'shaders_cleanup'
Eric Anholt [Fri, 10 Jul 2009 01:02:42 +0000 (18:02 -0700)]
intel: Partially fix fallback detection for glCopyTexSubImage.
Really, we should be checking that the MesaTexFormat for the read buffer
and the texture match, but the previous code wasn't even doing that, so
matching the cpp should be an improvement (and potentially fix some hangs!).
The previous code also rejected GL_RGB even though blitting the alpha
channel to the ignored channel of an x8r8g8b8 texture should be fine, which
tripped up compiz's blur plugin.
Maciej Cencora [Sun, 12 Jul 2009 13:09:15 +0000 (15:09 +0200)]
r300: always assume all components are read by fragment program
Components of input attributes that are used by fragment program aren't part of vertex program key, and that may lead to situations when vertex program writes only TEX1.xy and fragment program reads TEX1.xyz, resulting in rendering errors.
Reported-by: Nicolai Hähnle <nhaehnle@gmail.com>
Nicolai Hähnle [Sun, 12 Jul 2009 02:03:25 +0000 (02:03 +0000)]
r300: Fix fogcoord rewriting
We only care about the actual fogcoord itself now, reducing the rewriting
done for the vertex program.
The rewriting of source operand swizzles in the fragment program takes
care that fogcoord.yzw = 001.
This should fix fogcoord rewriting entirely, which had been horribly
broken in the face of dot-product instructions, and just broken (though
not horribly so) in the face of almost every other instruction (the W
component would be incorrect for most arithmetic instructions).
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
Maciej Cencora [Sat, 11 Jul 2009 17:10:58 +0000 (19:10 +0200)]
r300: fix swizzle masking in getUsedComponents
Maciej Cencora [Sat, 11 Jul 2009 14:41:52 +0000 (16:41 +0200)]
r300: minor fix
Split initializations becase the vars are of different type.
Reported-by: Nicolai Hähnle <nhaehnle@gmail.com>
Maciej Cencora [Sat, 11 Jul 2009 14:37:11 +0000 (16:37 +0200)]
r300: move variables declarations
Maciej Cencora [Sat, 11 Jul 2009 14:34:04 +0000 (16:34 +0200)]
r300: document r300_vertex_program_cont structure
Reported-by: Nicolai Hähnle <nhaehnle@gmail.com>
Maciej Cencora [Sat, 11 Jul 2009 14:26:23 +0000 (16:26 +0200)]
r300: document r300_fragment_program_cont struct
Maciej Cencora [Sat, 11 Jul 2009 14:16:11 +0000 (16:16 +0200)]
r300: fix indentation
Reported-by: Nicolai Hähnle <nhaehnle@gmail.com>
Maciej Cencora [Sat, 11 Jul 2009 13:53:01 +0000 (15:53 +0200)]
r300: fix StrideB == 0 case when converting data format
Reported-by: Nicolai Hähnle <nhaehnle@gmail.com>
Maciej Cencora [Sat, 11 Jul 2009 13:09:20 +0000 (15:09 +0200)]
r300: hw can handle per component negations in vertex shaders
Reported-by: Nicolai Haehnle <nhaehnle@gmail.com>
Maciej Cencora [Sun, 5 Jul 2009 01:17:32 +0000 (03:17 +0200)]
r300: fix WPOS for SWTCL
Maciej Cencora [Sat, 4 Jul 2009 21:38:59 +0000 (23:38 +0200)]
r300: removed unnecessary params
We don't have check which attributes are used by fragment program - it's already done by NQSSADCE.
Maciej Cencora [Sun, 5 Jul 2009 00:34:48 +0000 (02:34 +0200)]
r300: use NQSSADCE for vertex programs
Maciej Cencora [Sat, 4 Jul 2009 14:52:48 +0000 (16:52 +0200)]
r300: operate on copy of a program when pairing instructions
We need to keep unpaired program for vertex program NQSSADCE.
Maciej Cencora [Mon, 13 Jul 2009 17:23:18 +0000 (19:23 +0200)]
r300: handle relative addressing in NQSSADCE
Maciej Cencora [Sat, 4 Jul 2009 13:22:22 +0000 (15:22 +0200)]
r300: handle ARB_vertex_program specific instructions in NQSSADCE
Maciej Cencora [Sat, 4 Jul 2009 14:50:25 +0000 (16:50 +0200)]
r300: move depth output rewrite out of NQSSADCE
Maciej Cencora [Sun, 5 Jul 2009 00:32:51 +0000 (02:32 +0200)]
r300: rewrite FOGC and HPOS attribs handling
Rewrite vertex and fragment programs so that we don't have to do any hacks on lower level.
Maciej Cencora [Sun, 5 Jul 2009 00:03:32 +0000 (02:03 +0200)]
r300: bind vertex program to fragment program
Maciej Cencora [Sat, 4 Jul 2009 12:57:42 +0000 (14:57 +0200)]
r300: recalculate used inputs and outputs after dead code removal
Maciej Cencora [Sat, 4 Jul 2009 11:17:35 +0000 (13:17 +0200)]
r300: move fragment program selection before vertex program selection
Prepare for wpos and fogc handling rewrite.
Maciej Cencora [Fri, 3 Jul 2009 18:14:24 +0000 (20:14 +0200)]
r300: implement proper IsProgramNative check for vertex programs
Maciej Cencora [Fri, 3 Jul 2009 18:06:23 +0000 (20:06 +0200)]
r300: don't modify original vertex program
Keep the original vertex program untouched because it may be needed after some state change for generating new r300 specific vertex program.
Maciej Cencora [Sat, 4 Jul 2009 11:26:49 +0000 (13:26 +0200)]
r300: cache translated fragment programs
Maciej Cencora [Sat, 4 Jul 2009 10:56:31 +0000 (12:56 +0200)]
r300: update state parameters only once per rendering operation
Maciej Cencora [Wed, 1 Jul 2009 16:43:14 +0000 (18:43 +0200)]
r300: translate non native insts earlier for easier debugging
Maciej Cencora [Mon, 29 Jun 2009 19:52:39 +0000 (21:52 +0200)]
r300: print vertex program after adding artificial output insts
Maciej Cencora [Mon, 29 Jun 2009 19:48:35 +0000 (21:48 +0200)]
r300: use mesa provided function for adding MVP code
Maciej Cencora [Mon, 29 Jun 2009 19:39:59 +0000 (21:39 +0200)]
r300: simplify insert_wpos a little
Brian Paul [Mon, 13 Jul 2009 14:47:37 +0000 (08:47 -0600)]
Merge branch 'mesa_7_5_branch'
Dave Airlie [Mon, 13 Jul 2009 15:22:17 +0000 (01:22 +1000)]
radeon: port more front fixes from intel.
Port fixes to read buffer from front.