OSDN Git Service

android-x86/external-mesa.git
17 years agorearrange things in xmesa_clear() a bit
Brian [Wed, 1 Aug 2007 21:39:19 +0000 (15:39 -0600)]
rearrange things in xmesa_clear() a bit

17 years agoget cliprect bounds after softpipe_update_derived()
Brian [Wed, 1 Aug 2007 21:38:59 +0000 (15:38 -0600)]
get cliprect bounds after softpipe_update_derived()

17 years agoRe-implement intelClear() in terms of softpipe_clear(). Pretty simple/small now.
Brian [Wed, 1 Aug 2007 21:11:59 +0000 (15:11 -0600)]
Re-implement intelClear() in terms of softpipe_clear().  Pretty simple/small now.

Note: softpipe_clear() should really be renamed to something like
pipe_clear_with_blits() and put into a driver-indepedent module...

17 years agoMore work on glClear.
Brian [Wed, 1 Aug 2007 20:46:07 +0000 (14:46 -0600)]
More work on glClear.

Add a 'mask' param to region_fill() to help with clearing combined Z/stencil buffers, glColorMask, etc.

17 years agos/Z24_S8/S8_Z24/
Brian [Wed, 1 Aug 2007 19:11:34 +0000 (13:11 -0600)]
s/Z24_S8/S8_Z24/

17 years agos/Z24_S8/S8_Z24/ (stencil is in the high byte)
Brian [Wed, 1 Aug 2007 19:04:58 +0000 (13:04 -0600)]
s/Z24_S8/S8_Z24/ (stencil is in the high byte)

17 years agoCheckpoint: glClear changes - working, bug very rough.
Brian [Wed, 1 Aug 2007 18:58:38 +0000 (12:58 -0600)]
Checkpoint: glClear changes - working, bug very rough.

17 years agoBuild libsoftpipe.a
Keith Whitwell [Wed, 1 Aug 2007 14:56:23 +0000 (15:56 +0100)]
Build libsoftpipe.a

Each pipe driver will build to a .a library, as these will optionally
be included in the various DRI drivers (this will make more sense once
there is at least one hardware driver...).  Not strictly necessary for
softpipe, but want to minimize the differences between it and
actual hw implementations.

17 years agoRemove unused file intel_render.c
Keith Whitwell [Tue, 31 Jul 2007 20:06:31 +0000 (21:06 +0100)]
Remove unused file intel_render.c

17 years agoRemove unused file
Keith Whitwell [Tue, 31 Jul 2007 20:06:02 +0000 (21:06 +0100)]
Remove unused file

17 years agoRemove intel_span.[ch]
Keith Whitwell [Tue, 31 Jul 2007 20:05:24 +0000 (21:05 +0100)]
Remove intel_span.[ch]

17 years agosp_z_surface.h is dead
Brian [Tue, 31 Jul 2007 23:55:32 +0000 (17:55 -0600)]
sp_z_surface.h is dead

17 years agoObsolete.
Brian [Tue, 31 Jul 2007 23:54:56 +0000 (17:54 -0600)]
Obsolete.

17 years agoRedesign pipe_surface in terms of pipe_region.
Brian [Tue, 31 Jul 2007 23:42:03 +0000 (17:42 -0600)]
Redesign pipe_surface in terms of pipe_region.

struct pipe_buffer goes away.
Added basic region functions to softpipe to allocate/release malloc'd regions.
Surface-related code is fairly coherent now.

17 years agoLift region-related functions up to the pipe interface.
Brian [Tue, 31 Jul 2007 21:44:50 +0000 (15:44 -0600)]
Lift region-related functions up to the pipe interface.

Some of these functions probably should be driver-private.
Note: intel_buffer_object is in p_state.h and should be fixed/removed.
There are just a few i915 dependencies in intel_region.c

17 years agore-fix stencil addressing bug
Brian [Tue, 31 Jul 2007 19:42:23 +0000 (13:42 -0600)]
re-fix stencil addressing bug

17 years agoAdd missing files
Keith Whitwell [Tue, 31 Jul 2007 19:34:17 +0000 (20:34 +0100)]
Add missing files

17 years agoRemove references to intel_tris.h
Keith Whitwell [Tue, 31 Jul 2007 19:28:26 +0000 (20:28 +0100)]
Remove references to intel_tris.h

17 years agoBuild the "pipe" version of the i915tex driver.
Keith Whitwell [Tue, 31 Jul 2007 19:22:49 +0000 (20:22 +0100)]
Build the "pipe" version of the i915tex driver.

This hands all rendering off to the softpipe rasterizer.

17 years agoA version of the i915tex driver with all drawing code removed.
Keith Whitwell [Tue, 31 Jul 2007 19:06:09 +0000 (20:06 +0100)]
A version of the i915tex driver with all drawing code removed.

This is intended to support the softpipe development work.  More code
will be removed and pushed into softpipe until this basicially becomes
the DRI/GLX interface for that driver.

17 years agosimplify clear.x1,y2,x2,y2 setup
Brian [Tue, 31 Jul 2007 19:03:18 +0000 (13:03 -0600)]
simplify clear.x1,y2,x2,y2 setup

17 years agoIn i915/i830_emit_state(), check if state->draw_region is non-null.
Brian [Tue, 31 Jul 2007 18:49:11 +0000 (12:49 -0600)]
In i915/i830_emit_state(), check if state->draw_region is non-null.

This fixes a problem hit by glClear in the samples/stencil.c program.

17 years agofix stencil addressing bug
Brian [Tue, 31 Jul 2007 17:15:30 +0000 (11:15 -0600)]
fix stencil addressing bug

17 years agoremove obsolete xmesa_get_stencil_surface() stub
Brian [Tue, 31 Jul 2007 16:43:36 +0000 (10:43 -0600)]
remove obsolete xmesa_get_stencil_surface() stub

17 years agofix comments and param names for intel_miptree_image_map()
Brian [Tue, 31 Jul 2007 16:43:16 +0000 (10:43 -0600)]
fix comments and param names for intel_miptree_image_map()

17 years agofix value returned by intel_new_renderbuffer_fb()
Brian [Tue, 31 Jul 2007 16:42:39 +0000 (10:42 -0600)]
fix value returned by intel_new_renderbuffer_fb()

17 years agofix assertions
Brian [Tue, 31 Jul 2007 14:22:18 +0000 (08:22 -0600)]
fix assertions

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

17 years ago32 and z24s8 softpipe buffers
Brian [Tue, 31 Jul 2007 03:39:57 +0000 (21:39 -0600)]
32 and z24s8 softpipe buffers

17 years agoremove some obsolete xmesa remnants
Brian [Mon, 30 Jul 2007 23:20:02 +0000 (17:20 -0600)]
remove some obsolete xmesa remnants

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

17 years agoLots of improvements to the surface-related code.
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.

17 years agocompute scale for Z24 buffers
Brian [Mon, 30 Jul 2007 23:15:50 +0000 (17:15 -0600)]
compute scale for Z24 buffers

17 years agoimplement read_quad_f_swz()
Brian [Mon, 30 Jul 2007 20:00:27 +0000 (14:00 -0600)]
implement read_quad_f_swz()

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

17 years agoimplement surfaces for softpipe rendering
Brian [Mon, 30 Jul 2007 19:11:52 +0000 (13:11 -0600)]
implement surfaces for softpipe rendering

17 years agomap/unmap surfaces before/after rendering
Brian [Mon, 30 Jul 2007 19:11:27 +0000 (13:11 -0600)]
map/unmap surfaces before/after rendering

17 years agoremove old comments
Brian [Mon, 30 Jul 2007 19:11:09 +0000 (13:11 -0600)]
remove old comments

17 years agodisable ProgramStringNotify assertion
Brian [Mon, 30 Jul 2007 19:10:52 +0000 (13:10 -0600)]
disable ProgramStringNotify assertion

17 years agocall st_invalidate_state()
Brian [Mon, 30 Jul 2007 19:10:12 +0000 (13:10 -0600)]
call st_invalidate_state()

17 years agoadded map/unmap() stubs
Brian [Mon, 30 Jul 2007 19:09:53 +0000 (13:09 -0600)]
added map/unmap() stubs

17 years agofix range reduction for sin/cos in i915tex (#11609)
Roland Scheidegger [Sun, 29 Jul 2007 17:40:50 +0000 (19:40 +0200)]
fix range reduction for sin/cos in i915tex (#11609)

17 years agoFix crashes when the frag prog can't be handled in hardware (#11131)
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.)

17 years agorenaming, comments, clean-up
Brian [Fri, 27 Jul 2007 17:02:54 +0000 (11:02 -0600)]
renaming, comments, clean-up

17 years agoClip triangles against softpipe->cliprect which includes scissor and surface bounds.
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.

17 years agoremove obsolete comments
Brian [Fri, 27 Jul 2007 16:25:11 +0000 (10:25 -0600)]
remove obsolete comments

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 agoset the _BaseFormat for window-framebuffers, could hit some assertion otherwise
Roland Scheidegger [Sat, 21 Jul 2007 14:51:15 +0000 (16:51 +0200)]
set the _BaseFormat for window-framebuffers, could hit some assertion otherwise

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 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 agominor cleanups, disable debugging
Roland Scheidegger [Fri, 20 Jul 2007 09:33:24 +0000 (11:33 +0200)]
minor cleanups, disable debugging

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 agoremove some more really old ifdefed out code...
Roland Scheidegger [Thu, 19 Jul 2007 16:11:48 +0000 (18:11 +0200)]
remove some more really old ifdefed out code...

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)