OSDN Git Service
Keith Whitwell [Tue, 31 Jul 2007 13:37:45 +0000 (14:37 +0100)]
Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch
Conflicts:
src/mesa/drivers/dri/i915tex/intel_buffers.c
src/mesa/drivers/dri/i915tex/intel_context.c
src/mesa/drivers/dri/i915tex/intel_fbo.c
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c
Brian [Tue, 31 Jul 2007 03:39:57 +0000 (21:39 -0600)]
32 and z24s8 softpipe buffers
Brian [Mon, 30 Jul 2007 23:20:02 +0000 (17:20 -0600)]
remove some obsolete xmesa remnants
Brian [Mon, 30 Jul 2007 23:16:38 +0000 (17:16 -0600)]
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Brian [Mon, 30 Jul 2007 23:17:44 +0000 (17:17 -0600)]
Lots of improvements to the surface-related code.
Z testing now works with i915 driver.
Add gl_renderbuffer::surface pointer (and reverse pointer).
Remove intel_surface and xmesa_surface types - no longer used.
Brian [Mon, 30 Jul 2007 23:15:50 +0000 (17:15 -0600)]
compute scale for Z24 buffers
Brian [Mon, 30 Jul 2007 20:00:27 +0000 (14:00 -0600)]
implement read_quad_f_swz()
Brian [Mon, 30 Jul 2007 19:46:00 +0000 (13:46 -0600)]
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Brian [Mon, 30 Jul 2007 19:11:52 +0000 (13:11 -0600)]
implement surfaces for softpipe rendering
Brian [Mon, 30 Jul 2007 19:11:27 +0000 (13:11 -0600)]
map/unmap surfaces before/after rendering
Brian [Mon, 30 Jul 2007 19:11:09 +0000 (13:11 -0600)]
remove old comments
Brian [Mon, 30 Jul 2007 19:10:52 +0000 (13:10 -0600)]
disable ProgramStringNotify assertion
Brian [Mon, 30 Jul 2007 19:10:12 +0000 (13:10 -0600)]
call st_invalidate_state()
Brian [Mon, 30 Jul 2007 19:09:53 +0000 (13:09 -0600)]
added map/unmap() stubs
Roland Scheidegger [Sun, 29 Jul 2007 17:40:50 +0000 (19:40 +0200)]
fix range reduction for sin/cos in i915tex (#11609)
Roland Scheidegger [Sun, 29 Jul 2007 16:04:28 +0000 (18:04 +0200)]
Fix crashes when the frag prog can't be handled in hardware (#11131)
Must not change to/from swrast after Render.Start or bad things will happen.
(Driver will still somewhat incorrectly report an implementation error,
and apps can't really figure out if a prog is natively supported as validation
is later - could try doing it earlier to give some hint at least, even though
native status may still change later due to fog etc.)
Brian [Fri, 27 Jul 2007 17:02:54 +0000 (11:02 -0600)]
renaming, comments, clean-up
Brian [Fri, 27 Jul 2007 16:50:35 +0000 (10:50 -0600)]
Clip triangles against softpipe->cliprect which includes scissor and surface bounds.
This prevents rendering out of bounds when the viewport is partially outside the surface bounds.
Brian [Fri, 27 Jul 2007 16:25:11 +0000 (10:25 -0600)]
remove obsolete comments
Brian [Fri, 27 Jul 2007 16:21:34 +0000 (10:21 -0600)]
Maintain cliprect (scissor) info in sp_state_derived.c.
The cliprect depends on the scissor rect (if enabled), otherwise the drawing
surface bounds.
Brian [Fri, 27 Jul 2007 16:10:49 +0000 (10:10 -0600)]
Implement point/line quad clipping. Not quite as efficient as it probably could be, but sufficient for now.
Brian [Fri, 27 Jul 2007 15:27:56 +0000 (09:27 -0600)]
check scissor state
Brian [Fri, 27 Jul 2007 15:06:15 +0000 (09:06 -0600)]
s/SP_TILE_H/SP_QUAD_H/
Brian [Fri, 27 Jul 2007 15:06:02 +0000 (09:06 -0600)]
init quad.coverage values to 1.0 in case line AA is enabled so that we see something
michal [Fri, 27 Jul 2007 10:50:38 +0000 (12:50 +0200)]
Avoid unnecessary input attrib copy by aligning exec_machine attribs.
michal [Fri, 27 Jul 2007 08:05:40 +0000 (10:05 +0200)]
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Brian [Thu, 26 Jul 2007 21:32:02 +0000 (15:32 -0600)]
Fix function call bug 11731. Also, fix up IR_CALL/IR_FUNC confusion.
Brian [Thu, 26 Jul 2007 17:39:11 +0000 (11:39 -0600)]
generate error upon writing to varying var in fragment program (bug 11733)
Brian [Thu, 26 Jul 2007 14:22:47 +0000 (08:22 -0600)]
clamp float colors
Brian [Thu, 26 Jul 2007 14:22:28 +0000 (08:22 -0600)]
fix color interpolation for CHAN_BITS==32
Brian [Thu, 26 Jul 2007 14:22:09 +0000 (08:22 -0600)]
don't use rgba_line() if CHAN_BITS==32
Brian [Wed, 25 Jul 2007 21:48:09 +0000 (15:48 -0600)]
Implement line stippling.
Also added draw_stage::reset_line_stipple(). There may be a better way
of doing that though.
Brian [Wed, 25 Jul 2007 20:32:28 +0000 (14:32 -0600)]
rename some vars
Brian [Wed, 25 Jul 2007 20:28:24 +0000 (14:28 -0600)]
implement DDX, DDY instructions
Brian [Wed, 25 Jul 2007 20:27:38 +0000 (14:27 -0600)]
Fix pinterp() to compute 1 / FRAG_ATTRIB_WPOS.w Update comments too.
Brian [Wed, 25 Jul 2007 18:15:02 +0000 (12:15 -0600)]
patch things up enough to allow texture sampling to work
Brian [Tue, 24 Jul 2007 23:45:14 +0000 (17:45 -0600)]
remove unused MAX_3D_TEXTURE_SIZE, reformattting
Brian [Tue, 24 Jul 2007 23:10:30 +0000 (17:10 -0600)]
use consistent indentation
Brian [Tue, 24 Jul 2007 22:50:46 +0000 (16:50 -0600)]
check return value of tgsi_parse_init()
Brian [Tue, 24 Jul 2007 22:50:00 +0000 (16:50 -0600)]
added PROGRAM_NAMED_PARAM in map_register_file()
Brian [Tue, 24 Jul 2007 22:49:41 +0000 (16:49 -0600)]
added GL_FRAGMENT_PROGRAM_NV in st_new_program()
Brian [Tue, 24 Jul 2007 21:39:41 +0000 (15:39 -0600)]
Add VF_ATTRIB_VAR0..7 for varying variables.
The demos/fslight.c demo runs now.
Brian [Tue, 24 Jul 2007 21:38:41 +0000 (15:38 -0600)]
added PROGRAM_UNIFORM to map_register_file()
Brian [Tue, 24 Jul 2007 20:45:57 +0000 (14:45 -0600)]
comments
Brian [Tue, 24 Jul 2007 20:45:38 +0000 (14:45 -0600)]
s/GLuint/GLbitfield/
Brian [Tue, 24 Jul 2007 20:44:44 +0000 (14:44 -0600)]
Compute need_z and need_w properly and use the correct const/linear/perspective interpolation in shade_quad().
Brian [Tue, 24 Jul 2007 20:31:16 +0000 (14:31 -0600)]
Fix a typo (i << i) that was fouling up the vertex layout info.
Brian [Tue, 24 Jul 2007 19:48:20 +0000 (13:48 -0600)]
added missing OPCODE_ARL to TGSI_OPCODES[], added sanity check assertion
Brian [Tue, 24 Jul 2007 18:28:01 +0000 (12:28 -0600)]
added code to test per-vertex colors
Brian [Tue, 24 Jul 2007 18:27:38 +0000 (12:27 -0600)]
Basic fragment programs run now.
Handling of constants might change. For now, the st_fragment_program struct
contains a pipe_constant_buffer (not a pointer).
Brian [Tue, 24 Jul 2007 18:12:52 +0000 (12:12 -0600)]
rebuild quad pipeline when framebuffer changes too
Brian [Tue, 24 Jul 2007 16:00:29 +0000 (10:00 -0600)]
simple fragment shader test
Brian [Tue, 24 Jul 2007 15:58:19 +0000 (09:58 -0600)]
use enabled/linked fragment shader in preference to a fragment program
Brian [Tue, 24 Jul 2007 15:57:26 +0000 (09:57 -0600)]
call ctx->Driver.NewProgram() instead of _mesa_new_program()
Brian [Tue, 24 Jul 2007 15:56:44 +0000 (09:56 -0600)]
call ctx->Driver.NewProgram() instead of _mesa_new_program()
Brian [Tue, 24 Jul 2007 15:19:22 +0000 (09:19 -0600)]
fix logic error, typos
Brian [Tue, 24 Jul 2007 15:17:59 +0000 (09:17 -0600)]
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Brian [Mon, 23 Jul 2007 22:51:57 +0000 (16:51 -0600)]
fix GLX_STEREO handling (bug 11705)
michal [Mon, 23 Jul 2007 16:26:25 +0000 (18:26 +0200)]
Execute fs tokens.
Fix align128 bug.
Zhang [Sat, 21 Jul 2007 17:28:06 +0000 (11:28 -0600)]
Fix a number of MINGW32 issues
Brian [Sat, 21 Jul 2007 16:06:18 +0000 (10:06 -0600)]
Remove ctx->Point._Size and ctx->Line._Width.
The clamping for these values depends on whether we're drawing AA or non-AA
points, lines. Defer clamping until drawing time. Drivers could compute and
keep clamped AA and clamped non-AA values if desired.
Brian [Sat, 21 Jul 2007 16:04:14 +0000 (10:04 -0600)]
remove VC6/VC7 project files until updated
Roland Scheidegger [Sat, 21 Jul 2007 14:51:15 +0000 (16:51 +0200)]
set the _BaseFormat for window-framebuffers, could hit some assertion otherwise
Roland Scheidegger [Fri, 20 Jul 2007 09:34:26 +0000 (11:34 +0200)]
fix bogus recently introduced function param comments
Roland Scheidegger [Fri, 20 Jul 2007 09:34:26 +0000 (11:34 +0200)]
fix bogus recently introduced function param comments
Roland Scheidegger [Fri, 20 Jul 2007 09:33:24 +0000 (11:33 +0200)]
minor cleanups, disable debugging
Keith Whitwell [Thu, 19 Jul 2007 19:24:55 +0000 (20:24 +0100)]
Trigger tgsi compilation for fragment programs.
Not sure the generated program looks correct though...
Roland Scheidegger [Thu, 19 Jul 2007 16:11:48 +0000 (18:11 +0200)]
remove some more really old ifdefed out code...
Roland Scheidegger [Wed, 18 Jul 2007 18:17:14 +0000 (20:17 +0200)]
fix mesa's handling of fbo's / window fb (again)
Make sure the relevant fields in window fbs get updated at appropriate time
(those are NOT the same as fbos!!!), and fix up related code accordingly.
This is a bit ugly, but there's a reason the issues section in EXT_fbo is
a couple hundred pages long...
Hopefully correct now.
Roland Scheidegger [Wed, 18 Jul 2007 16:07:12 +0000 (18:07 +0200)]
more fixes for mesa's fbo handling (fixes tests/fbotest1/2)
Roland Scheidegger [Thu, 19 Jul 2007 15:58:21 +0000 (17:58 +0200)]
fix up mesa's probably bogus framebuffer updates with different read/write fbs
Conflicts:
src/mesa/main/framebuffer.c
Roland Scheidegger [Tue, 17 Jul 2007 15:29:55 +0000 (17:29 +0200)]
fix mesa fb binding
Make sure that we bind the right buffer (draw or read) when rebinding
the window framebuffer (the api doesn't allow binding different draw and
read buffers at the same time, but the default window framebuffer is basically
2 fb objects, one for read, one for write, which can be different). Pass both
of these two down the driver api (no driver uses this right now).
Roland Scheidegger [Tue, 17 Jul 2007 10:56:30 +0000 (12:56 +0200)]
increase MAX_RELOCS so never run out before batch buffer is full (fixes xdemos/shape)
Roland Scheidegger [Thu, 19 Jul 2007 15:42:14 +0000 (17:42 +0200)]
more cleanups (looks pretty reasonable now)
remove some already ifdefed out, no longer functional and used code.
Don't do our own scissor clipping in the pixeldraw/copy paths,
as meas already does that for us...
Roland Scheidegger [Thu, 19 Jul 2007 14:41:14 +0000 (16:41 +0200)]
fix drawables not getting freed if context is made current with new drawables
Roland Scheidegger [Wed, 18 Jul 2007 18:17:14 +0000 (20:17 +0200)]
fix mesa's handling of fbo's / window fb (again)
Make sure the relevant fields in window fbs get updated at appropriate time
(those are NOT the same as fbos!!!), and fix up related code accordingly.
This is a bit ugly, but there's a reason the issues section in EXT_fbo is
a couple hundred pages long...
Hopefully correct now.
Roland Scheidegger [Wed, 18 Jul 2007 16:07:12 +0000 (18:07 +0200)]
more fixes for mesa's fbo handling (fixes tests/fbotest1/2)
Roland Scheidegger [Wed, 18 Jul 2007 13:18:43 +0000 (15:18 +0200)]
swapbuffers with non-current contexts, cleanups
manywin got broken (when intelPageflip got no longer called).
Make sure that intelFlush is getting called when a context gets unbound,
to handle later swapbuffer calls on that context's drawable better.
Related, fix non-current cliprects getting used on unbound drawables.
Oliver McFadden [Wed, 18 Jul 2007 02:59:08 +0000 (02:59 +0000)]
Oliver McFadden [Wed, 18 Jul 2007 02:49:26 +0000 (02:49 +0000)]
r300: Cleaned up vertprog construction.
Construct the vertprog instruction in the 4 DWORD parts...
DWORD 0: Opcode and Output.
DWORD 1: First Argument.
DWORD 2: Second Argument.
DWORD 3: Third Argument.
Allow the opcode translation functions to generate more than one instruction;
useful for when an instruction must be emulated. FLR, XPD, etc.
Tommy Schultz Lassen [Wed, 18 Jul 2007 00:37:43 +0000 (00:37 +0000)]
r300: Corrected texcoord start when BFC1 is enabled.
Roland Scheidegger [Tue, 17 Jul 2007 18:06:44 +0000 (20:06 +0200)]
get rid of checks for old ddx
Roland Scheidegger [Tue, 17 Jul 2007 17:49:25 +0000 (19:49 +0200)]
remove some more old stuff
Roland Scheidegger [Tue, 17 Jul 2007 17:37:05 +0000 (19:37 +0200)]
get rid of more pageflip/rotation code.
Roland Scheidegger [Tue, 17 Jul 2007 17:22:23 +0000 (19:22 +0200)]
fix up mesa's probably bogus framebuffer updates with different read/write fbs
Roland Scheidegger [Tue, 17 Jul 2007 15:29:55 +0000 (17:29 +0200)]
fix mesa fb binding
Make sure that we bind the right buffer (draw or read) when rebinding
the window framebuffer (the api doesn't allow binding different draw and
read buffers at the same time, but the default window framebuffer is basically
2 fb objects, one for read, one for write, which can be different). Pass both
of these two down the driver api (no driver uses this right now).
Roland Scheidegger [Tue, 17 Jul 2007 13:56:43 +0000 (15:56 +0200)]
remove old code, remaining bits of static handles, disable (no longer functional anyway) rotation code
Roland Scheidegger [Tue, 17 Jul 2007 10:56:30 +0000 (12:56 +0200)]
increase MAX_RELOCS so never run out before batch buffer is full (fixes xdemos/shape)
Keith Whitwell [Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)]
Merge branch 'origin' into softpipe_0_1_branch
Keith Whitwell [Tue, 17 Jul 2007 10:06:02 +0000 (11:06 +0100)]
Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch
Oliver McFadden [Mon, 16 Jul 2007 21:43:39 +0000 (21:43 +0000)]
r300: Corrected some progs/fp/* regressions from the BFC patch.
I'm not completely sure this is correct; it restores the old behaviour.
Oliver McFadden [Mon, 16 Jul 2007 20:24:41 +0000 (20:24 +0000)]
r300: Use _mesa_num_inst_src_regs for number of arguments.
Oliver McFadden [Mon, 16 Jul 2007 20:07:30 +0000 (20:07 +0000)]
r300: Corrected vertprog FLR and XPD instruction regression.
Oliver McFadden [Mon, 16 Jul 2007 19:20:32 +0000 (19:20 +0000)]
r300: Added code for vertprog opcode ARL.
Oliver McFadden [Mon, 16 Jul 2007 19:13:46 +0000 (19:13 +0000)]
r300: Don't need vertprog scalar flag anymore; it's handled explicitly...
Oliver McFadden [Mon, 16 Jul 2007 19:10:13 +0000 (19:10 +0000)]
r300: Removed broken RCC vertprog opcode.
Oliver McFadden [Mon, 16 Jul 2007 19:09:29 +0000 (19:09 +0000)]
r300: More vertprog rework; give each opcode it's own function.
Roland Scheidegger [Mon, 16 Jul 2007 18:53:33 +0000 (20:53 +0200)]
fix resize bugs (fb size updated too late), fix typos, cleanups...
Roland Scheidegger [Mon, 16 Jul 2007 17:01:47 +0000 (19:01 +0200)]
small cleanups
Oliver McFadden [Mon, 16 Jul 2007 16:21:21 +0000 (16:21 +0000)]
Revert "r300: Gracefully exit after GART memory is exhausted."
This reverts commit
9457bf62bbba3b9226ebbbea5dc7798ca22485f6.
Causes the X server to die with Compiz and Beryl.