OSDN Git Service

android-x86/external-mesa.git
17 years agoMaintain cliprect (scissor) info in sp_state_derived.c.
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.

17 years agoImplement point/line quad clipping. Not quite as efficient as it probably could...
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.

17 years agocheck scissor state
Brian [Fri, 27 Jul 2007 15:27:56 +0000 (09:27 -0600)]
check scissor state

17 years agos/SP_TILE_H/SP_QUAD_H/
Brian [Fri, 27 Jul 2007 15:06:15 +0000 (09:06 -0600)]
s/SP_TILE_H/SP_QUAD_H/

17 years agoinit quad.coverage values to 1.0 in case line AA is enabled so that we see something
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

17 years agoAvoid unnecessary input attrib copy by aligning exec_machine attribs.
michal [Fri, 27 Jul 2007 10:50:38 +0000 (12:50 +0200)]
Avoid unnecessary input attrib copy by aligning exec_machine attribs.

17 years agoMerge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into...
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

17 years agoFix function call bug 11731. Also, fix up IR_CALL/IR_FUNC confusion.
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.

17 years agogenerate error upon writing to varying var in fragment program (bug 11733)
Brian [Thu, 26 Jul 2007 17:39:11 +0000 (11:39 -0600)]
generate error upon writing to varying var in fragment program (bug 11733)

17 years agoclamp float colors
Brian [Thu, 26 Jul 2007 14:22:47 +0000 (08:22 -0600)]
clamp float colors

17 years agofix color interpolation for CHAN_BITS==32
Brian [Thu, 26 Jul 2007 14:22:28 +0000 (08:22 -0600)]
fix color interpolation for CHAN_BITS==32

17 years agodon't use rgba_line() if CHAN_BITS==32
Brian [Thu, 26 Jul 2007 14:22:09 +0000 (08:22 -0600)]
don't use rgba_line() if CHAN_BITS==32

17 years agoImplement line stippling.
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.

17 years agorename some vars
Brian [Wed, 25 Jul 2007 20:32:28 +0000 (14:32 -0600)]
rename some vars

17 years agoimplement DDX, DDY instructions
Brian [Wed, 25 Jul 2007 20:28:24 +0000 (14:28 -0600)]
implement DDX, DDY instructions

17 years agoFix pinterp() to compute 1 / FRAG_ATTRIB_WPOS.w Update comments too.
Brian [Wed, 25 Jul 2007 20:27:38 +0000 (14:27 -0600)]
Fix pinterp() to compute 1 / FRAG_ATTRIB_WPOS.w  Update comments too.

17 years agopatch things up enough to allow texture sampling to work
Brian [Wed, 25 Jul 2007 18:15:02 +0000 (12:15 -0600)]
patch things up enough to allow texture sampling to work

17 years agoremove unused MAX_3D_TEXTURE_SIZE, reformattting
Brian [Tue, 24 Jul 2007 23:45:14 +0000 (17:45 -0600)]
remove unused MAX_3D_TEXTURE_SIZE, reformattting

17 years agouse consistent indentation
Brian [Tue, 24 Jul 2007 23:10:30 +0000 (17:10 -0600)]
use consistent indentation

17 years agocheck return value of tgsi_parse_init()
Brian [Tue, 24 Jul 2007 22:50:46 +0000 (16:50 -0600)]
check return value of tgsi_parse_init()

17 years agoadded PROGRAM_NAMED_PARAM in map_register_file()
Brian [Tue, 24 Jul 2007 22:50:00 +0000 (16:50 -0600)]
added PROGRAM_NAMED_PARAM in map_register_file()

17 years agoadded GL_FRAGMENT_PROGRAM_NV in st_new_program()
Brian [Tue, 24 Jul 2007 22:49:41 +0000 (16:49 -0600)]
added GL_FRAGMENT_PROGRAM_NV in st_new_program()

17 years agoAdd VF_ATTRIB_VAR0..7 for varying variables.
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.

17 years agoadded PROGRAM_UNIFORM to map_register_file()
Brian [Tue, 24 Jul 2007 21:38:41 +0000 (15:38 -0600)]
added PROGRAM_UNIFORM to map_register_file()

17 years agocomments
Brian [Tue, 24 Jul 2007 20:45:57 +0000 (14:45 -0600)]
comments

17 years agos/GLuint/GLbitfield/
Brian [Tue, 24 Jul 2007 20:45:38 +0000 (14:45 -0600)]
s/GLuint/GLbitfield/

17 years agoCompute need_z and need_w properly and use the correct const/linear/perspective inter...
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().

17 years agoFix a typo (i << i) that was fouling up the vertex layout info.
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.

17 years agoadded missing OPCODE_ARL to TGSI_OPCODES[], added sanity check assertion
Brian [Tue, 24 Jul 2007 19:48:20 +0000 (13:48 -0600)]
added missing OPCODE_ARL to TGSI_OPCODES[], added sanity check assertion

17 years agoadded code to test per-vertex colors
Brian [Tue, 24 Jul 2007 18:28:01 +0000 (12:28 -0600)]
added code to test per-vertex colors

17 years agoBasic fragment programs run now.
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).

17 years agorebuild quad pipeline when framebuffer changes too
Brian [Tue, 24 Jul 2007 18:12:52 +0000 (12:12 -0600)]
rebuild quad pipeline when framebuffer changes too

17 years agosimple fragment shader test
Brian [Tue, 24 Jul 2007 16:00:29 +0000 (10:00 -0600)]
simple fragment shader test

17 years agouse enabled/linked fragment shader in preference to a fragment program
Brian [Tue, 24 Jul 2007 15:58:19 +0000 (09:58 -0600)]
use enabled/linked fragment shader in preference to a fragment program

17 years agocall ctx->Driver.NewProgram() instead of _mesa_new_program()
Brian [Tue, 24 Jul 2007 15:57:26 +0000 (09:57 -0600)]
call ctx->Driver.NewProgram() instead of _mesa_new_program()

17 years agocall 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()

17 years agofix logic error, typos
Brian [Tue, 24 Jul 2007 15:19:22 +0000 (09:19 -0600)]
fix logic error, typos

17 years agoMerge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa...
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

17 years agofix GLX_STEREO handling (bug 11705)
Brian [Mon, 23 Jul 2007 22:51:57 +0000 (16:51 -0600)]
fix GLX_STEREO handling (bug 11705)

17 years agoExecute fs tokens.
michal [Mon, 23 Jul 2007 16:26:25 +0000 (18:26 +0200)]
Execute fs tokens.
Fix align128 bug.

17 years agoFix a number of MINGW32 issues
Zhang [Sat, 21 Jul 2007 17:28:06 +0000 (11:28 -0600)]
Fix a number of MINGW32 issues

17 years agoRemove ctx->Point._Size and ctx->Line._Width.
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.

17 years agoremove VC6/VC7 project files until updated
Brian [Sat, 21 Jul 2007 16:04:14 +0000 (10:04 -0600)]
remove VC6/VC7 project files until updated

17 years agofix 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

17 years agoTrigger tgsi compilation for fragment programs.
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...

17 years agofix mesa's handling of fbo's / window fb (again)
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.

17 years agomore fixes for mesa's fbo handling (fixes tests/fbotest1/2)
Roland Scheidegger [Wed, 18 Jul 2007 16:07:12 +0000 (18:07 +0200)]
more fixes for mesa's fbo handling (fixes tests/fbotest1/2)

17 years agofix up mesa's probably bogus framebuffer updates with different read/write fbs
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

17 years agofix mesa fb binding
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).

17 years agoincrease MAX_RELOCS so never run out before batch buffer is full (fixes xdemos/shape)
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)

17 years agor300: Oops, made a mistake on commit fb4e071beda6e3b9e68a21bbc7649b6c4733c485.
Oliver McFadden [Wed, 18 Jul 2007 02:59:08 +0000 (02:59 +0000)]
r300: Oops, made a mistake on commit fb4e071beda6e3b9e68a21bbc7649b6c4733c485.

17 years agor300: Cleaned up vertprog construction.
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.

17 years agor300: Corrected texcoord start when BFC1 is enabled.
Tommy Schultz Lassen [Wed, 18 Jul 2007 00:37:43 +0000 (00:37 +0000)]
r300: Corrected texcoord start when BFC1 is enabled.

17 years agoMerge branch 'origin' into softpipe_0_1_branch
Keith Whitwell [Tue, 17 Jul 2007 10:06:31 +0000 (11:06 +0100)]
Merge branch 'origin' into softpipe_0_1_branch

17 years agoMerge branch 'i915tex_privbuffers' 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

17 years agor300: Corrected some progs/fp/* regressions from the BFC patch.
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.

17 years agor300: Use _mesa_num_inst_src_regs for number of arguments.
Oliver McFadden [Mon, 16 Jul 2007 20:24:41 +0000 (20:24 +0000)]
r300: Use _mesa_num_inst_src_regs for number of arguments.

17 years agor300: Corrected vertprog FLR and XPD instruction regression.
Oliver McFadden [Mon, 16 Jul 2007 20:07:30 +0000 (20:07 +0000)]
r300: Corrected vertprog FLR and XPD instruction regression.

17 years agor300: Added code for vertprog opcode ARL.
Oliver McFadden [Mon, 16 Jul 2007 19:20:32 +0000 (19:20 +0000)]
r300: Added code for vertprog opcode ARL.

17 years agor300: Don't need vertprog scalar flag anymore; it's handled explicitly...
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...

17 years agor300: Removed broken RCC vertprog opcode.
Oliver McFadden [Mon, 16 Jul 2007 19:10:13 +0000 (19:10 +0000)]
r300: Removed broken RCC vertprog opcode.

17 years agor300: More vertprog rework; give each opcode it's own function.
Oliver McFadden [Mon, 16 Jul 2007 19:09:29 +0000 (19:09 +0000)]
r300: More vertprog rework; give each opcode it's own function.

17 years agoRevert "r300: Gracefully exit after GART memory is exhausted."
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.

17 years agor300: Reorder the vertprog code to the ARB specification.
Oliver McFadden [Mon, 16 Jul 2007 16:17:50 +0000 (16:17 +0000)]
r300: Reorder the vertprog code to the ARB specification.

17 years agofix bogus fb/drawable information
Roland Scheidegger [Mon, 16 Jul 2007 16:21:36 +0000 (18:21 +0200)]
fix bogus fb/drawable information

the framebuffer objects attached to drawables can have invalidate state
associated with them, since for the window framebuffer this is per-context
state and not per-fbo state. Since drivers rely on that information
(otherwise would need to check if currently the window-framebuffer is
bound in a lot of places) fix it up in _mesa_make_current (ugly).
(Brought over from i915tex_privbuffers, where it fixes xdemos/wincopy
when switching to front buffer rendering.)

17 years agofix segfault with i915 drivers in swrast drawpixels path when resizing windows
Roland Scheidegger [Mon, 16 Jul 2007 16:09:30 +0000 (18:09 +0200)]
fix segfault with i915 drivers in swrast drawpixels path when resizing windows

17 years agor300: Use the R300_PVS_UPLOAD_* defines.
Oliver McFadden [Mon, 16 Jul 2007 15:42:16 +0000 (15:42 +0000)]
r300: Use the R300_PVS_UPLOAD_* defines.

17 years agor300: Added the clip plane upload defines.
Oliver McFadden [Mon, 16 Jul 2007 15:39:12 +0000 (15:39 +0000)]
r300: Added the clip plane upload defines.

17 years agor300: Enable the vertprog point size again.
Oliver McFadden [Mon, 16 Jul 2007 12:21:38 +0000 (12:21 +0000)]
r300: Enable the vertprog point size again.

17 years agor300: Corrected position bug with position invariant option. Bug #11594.
Oliver McFadden [Mon, 16 Jul 2007 11:34:40 +0000 (11:34 +0000)]
r300: Corrected position bug with position invariant option. Bug #11594.

17 years agor300: Removed Vim modeline I left in the file by mistake. :-)
Oliver McFadden [Mon, 16 Jul 2007 07:17:22 +0000 (07:17 +0000)]
r300: Removed Vim modeline I left in the file by mistake. :-)

17 years agor300: Make sure the modified value of u_temp_i is respected.
Oliver McFadden [Mon, 16 Jul 2007 07:12:29 +0000 (07:12 +0000)]
r300: Make sure the modified value of u_temp_i is respected.

17 years agor300: Added a function for vertex program default opcode translation.
Oliver McFadden [Mon, 16 Jul 2007 06:38:12 +0000 (06:38 +0000)]
r300: Added a function for vertex program default opcode translation.

17 years agor300: Clean up the vertex program maximum length check.
Oliver McFadden [Mon, 16 Jul 2007 06:33:53 +0000 (06:33 +0000)]
r300: Clean up the vertex program maximum length check.

17 years agor300: Corrected indenting in r300_vertprog.c.
Oliver McFadden [Mon, 16 Jul 2007 06:27:29 +0000 (06:27 +0000)]
r300: Corrected indenting in r300_vertprog.c.

17 years agor300: Major vertex program code clean up and rework.
Oliver McFadden [Mon, 16 Jul 2007 06:16:35 +0000 (06:16 +0000)]
r300: Major vertex program code clean up and rework.

17 years agor300: Replaced the ugly VERTEX_SHADER_INSTRUCTION typedef.
Oliver McFadden [Mon, 16 Jul 2007 05:04:10 +0000 (05:04 +0000)]
r300: Replaced the ugly VERTEX_SHADER_INSTRUCTION typedef.

17 years agor300: Gracefully exit after GART memory is exhausted.
Oliver McFadden [Sun, 15 Jul 2007 01:17:54 +0000 (01:17 +0000)]
r300: Gracefully exit after GART memory is exhausted.

17 years agor300: Disable vertex program point size; it's almost certainly wrong.
Oliver McFadden [Sat, 14 Jul 2007 18:31:29 +0000 (18:31 +0000)]
r300: Disable vertex program point size; it's almost certainly wrong.

See the conversation between myself and Tommy Schultz Lassen on mesa3d-dev.

17 years agor300: Clean up the vertex program output assignment.
Oliver McFadden [Sat, 14 Jul 2007 18:11:45 +0000 (18:11 +0000)]
r300: Clean up the vertex program output assignment.

17 years agonouveau: nv10 and nv11,15 are different
Patrice Mandin [Sat, 14 Jul 2007 16:54:22 +0000 (18:54 +0200)]
nouveau: nv10 and nv11,15 are different

17 years agofix shader/info string length queries (bug 11588)
Jan Dvorak [Fri, 13 Jul 2007 22:36:00 +0000 (16:36 -0600)]
fix shader/info string length queries (bug 11588)

17 years agoFix setup.light_twoside determination.
Brian [Fri, 13 Jul 2007 20:28:15 +0000 (14:28 -0600)]
Fix setup.light_twoside determination.

When a vertex program is used, use value of GL_VERTEX_PROGRAM_TWO_SIDE.
Otherwise, if FF lighting, use value of GL_LIGHT_MODEL_TWO_SIDE.

17 years agopress 'f' to toggle front-face winding
Brian [Fri, 13 Jul 2007 20:25:28 +0000 (14:25 -0600)]
press 'f' to toggle front-face winding

17 years agoFix more polygon winding, culling confusion.
Brian [Fri, 13 Jul 2007 20:22:46 +0000 (14:22 -0600)]
Fix more polygon winding, culling confusion.

If the determinant of the triangle is positive, its winding is CCW (right-handed coord system).

17 years agoFix for-loop in interp() so we don't go out of bounds.
Brian [Fri, 13 Jul 2007 18:28:42 +0000 (12:28 -0600)]
Fix for-loop in interp() so we don't go out of bounds.

Improved comments for that loop.
Added some sanity check assertions regarding vertex layout.

17 years agoset INTERP_CONSTANT when appropriate
Brian [Fri, 13 Jul 2007 18:26:09 +0000 (12:26 -0600)]
set INTERP_CONSTANT when appropriate

Not really signficant now since draw_flat stage copies the provoking
vertex color to all prim verts.

17 years agocomments
Brian [Fri, 13 Jul 2007 18:23:34 +0000 (12:23 -0600)]
comments

17 years agoEnable Keith's branch-less stipple code - it works.
Brian [Fri, 13 Jul 2007 17:16:13 +0000 (11:16 -0600)]
Enable Keith's branch-less stipple code - it works.

17 years agoAdd 'prim' field to quad so that stipple and aa coverage stages can do the right...
Brian [Fri, 13 Jul 2007 17:15:10 +0000 (11:15 -0600)]
Add 'prim' field to quad so that stipple and aa coverage stages can do the right thing.

17 years agoImplement AA points and AA coverage application in quad pipeline.
Brian [Fri, 13 Jul 2007 16:33:48 +0000 (10:33 -0600)]
Implement AA points and AA coverage application in quad pipeline.

17 years agopress 's' to toggle smoothing
Brian [Fri, 13 Jul 2007 16:32:56 +0000 (10:32 -0600)]
press 's' to toggle smoothing

17 years agoAdded basic occlusion counting
Brian [Fri, 13 Jul 2007 15:25:57 +0000 (09:25 -0600)]
Added basic occlusion counting

17 years agominor rename
Brian [Fri, 13 Jul 2007 15:23:41 +0000 (09:23 -0600)]
minor rename

17 years agoPlay "nuke the typedef"
Ben Skeggs [Fri, 13 Jul 2007 13:39:24 +0000 (23:39 +1000)]
Play "nuke the typedef"

17 years agoAdd conditional-free implementation (disabled, not tested)
Keith Whitwell [Fri, 13 Jul 2007 10:28:42 +0000 (11:28 +0100)]
Add conditional-free implementation (disabled, not tested)

17 years agoSimplify slightly.
Keith Whitwell [Fri, 13 Jul 2007 10:27:57 +0000 (11:27 +0100)]
Simplify slightly.

Don't bother trying to save a small memcpy.

17 years agoRevert "r300: Corrected off-by-one error in r300_vertprog.c."
Oliver McFadden [Fri, 13 Jul 2007 09:39:23 +0000 (09:39 +0000)]
Revert "r300: Corrected off-by-one error in r300_vertprog.c."

This reverts commit 07ac2386f5c0ab9c2432d4b5e3490b1e13d033fc.

17 years agor300: Corrected off-by-one error in r300_vertprog.c.
Oliver McFadden [Fri, 13 Jul 2007 04:58:32 +0000 (04:58 +0000)]
r300: Corrected off-by-one error in r300_vertprog.c.

17 years agor300: Moved some hardware initialization into appropriate functions.
Oliver McFadden [Fri, 13 Jul 2007 02:11:58 +0000 (02:11 +0000)]
r300: Moved some hardware initialization into appropriate functions.