Brian [Mon, 20 Aug 2007 16:23:28 +0000 (10:23 -0600)]
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Brian [Sun, 19 Aug 2007 16:31:21 +0000 (17:31 +0100)]
Fix some draw_arrays issues.
We weren't mapping all the needed vertex array buffers.
Move array state that was temporarily in draw_context to softpipe_context.
Remove a bunch of dead code.
Brian [Sat, 18 Aug 2007 15:06:49 +0000 (16:06 +0100)]
more work on vertex shaders, now using vertex shaders instead of TnL module by default
Brian [Sat, 18 Aug 2007 15:05:49 +0000 (16:05 +0100)]
Create a default vertex attribute buffer which mirrors ctx->Current.Attrrib[]
Used when the vertex shader references attributes which aren't present in VBOs.
Brian [Sat, 18 Aug 2007 15:04:49 +0000 (16:04 +0100)]
added tnl state atom
Brian [Sat, 18 Aug 2007 08:22:15 +0000 (09:22 +0100)]
fix xm_buffer_data
Brian [Fri, 17 Aug 2007 18:40:35 +0000 (12:40 -0600)]
replace memcpy() with assignment, better type safety
Brian [Fri, 17 Aug 2007 18:34:40 +0000 (12:34 -0600)]
added CLIP_x_SHIFT vals
Brian [Fri, 17 Aug 2007 18:31:13 +0000 (12:31 -0600)]
write outputs according to vs.outputs_written
Brian [Fri, 17 Aug 2007 18:30:30 +0000 (12:30 -0600)]
added outputs_written field to pipe_shader_state
Brian [Fri, 17 Aug 2007 18:23:26 +0000 (12:23 -0600)]
load machine.Inputs based on vs.inputs_read
Brian [Fri, 17 Aug 2007 18:19:40 +0000 (12:19 -0600)]
added pipe ptr to draw_context
Brian [Fri, 17 Aug 2007 18:09:50 +0000 (12:09 -0600)]
compute clipmask
Brian [Fri, 17 Aug 2007 18:09:31 +0000 (12:09 -0600)]
define CLIP_LEFT/RIGHT etc
Brian [Fri, 17 Aug 2007 17:40:53 +0000 (11:40 -0600)]
shade four vertices at a time
Brian [Fri, 17 Aug 2007 17:40:06 +0000 (11:40 -0600)]
added align16() function
Brian [Fri, 17 Aug 2007 17:39:45 +0000 (11:39 -0600)]
added uint64 type
Brian [Fri, 17 Aug 2007 14:38:29 +0000 (15:38 +0100)]
added null VB->AttribPtr[i] check
Brian [Fri, 17 Aug 2007 14:37:22 +0000 (15:37 +0100)]
fix edgeflag bug
Brian [Fri, 17 Aug 2007 14:28:17 +0000 (15:28 +0100)]
pack output vertex attributes in sequential slots
Brian [Fri, 17 Aug 2007 14:27:18 +0000 (15:27 +0100)]
tell vbo module to use bufferobjs
Brian [Fri, 17 Aug 2007 14:27:00 +0000 (15:27 +0100)]
added call to _mesa_load_state_parameters()
Brian [Fri, 17 Aug 2007 14:26:33 +0000 (15:26 +0100)]
added vbo_use_buffer_objects() to specify that immediate mode data should be put into bufferobjects
Brian [Fri, 17 Aug 2007 09:50:06 +0000 (10:50 +0100)]
replace assertion w/ conditionals in xmesa_clear()
Brian [Fri, 17 Aug 2007 09:49:36 +0000 (10:49 +0100)]
Use simple st->pipe->clear() in more cases for depth/stencil clears.
Brian [Fri, 17 Aug 2007 09:28:20 +0000 (10:28 +0100)]
fix buffer clearing problems
Brian [Fri, 17 Aug 2007 09:27:53 +0000 (10:27 +0100)]
assertions
Brian [Fri, 17 Aug 2007 09:27:37 +0000 (10:27 +0100)]
added assertions, disable debug output
michal [Thu, 16 Aug 2007 18:50:08 +0000 (19:50 +0100)]
Break mesa dependencies.
Silence compiler warnings.
michal [Thu, 16 Aug 2007 18:49:04 +0000 (19:49 +0100)]
Silence compiler warnings.
michal [Thu, 16 Aug 2007 18:47:18 +0000 (19:47 +0100)]
Break mesa dependencies.
Silence compiler warnings.
michal [Thu, 16 Aug 2007 18:45:55 +0000 (19:45 +0100)]
Silence compiler warnings.
michal [Thu, 16 Aug 2007 18:44:53 +0000 (19:44 +0100)]
Define ffs() for __WIN32__ & __MSC__.
Break mesa dependencies.
michal [Thu, 16 Aug 2007 18:42:28 +0000 (19:42 +0100)]
Define __WIN32__.
michal [Thu, 16 Aug 2007 17:29:45 +0000 (18:29 +0100)]
Move VS code from st_atom_fs.c to st_atom_vs.c.
michal [Thu, 16 Aug 2007 17:16:32 +0000 (18:16 +0100)]
Cosmetic changes.
Brian [Fri, 17 Aug 2007 00:11:55 +0000 (18:11 -0600)]
Remove many dependencies on mesa headers.
To build with mesa, need -DMESA in makefile/config file.
Brian [Thu, 16 Aug 2007 23:33:49 +0000 (17:33 -0600)]
misc changes to support vertex shaders (disabled by default)
Brian [Thu, 16 Aug 2007 23:33:05 +0000 (17:33 -0600)]
run real vertex shaders, a total hack for now
Brian [Thu, 16 Aug 2007 23:32:24 +0000 (17:32 -0600)]
make pass-through vertex shader
Brian [Thu, 16 Aug 2007 23:30:38 +0000 (17:30 -0600)]
check for null swrast (pipe work-around)
Brian [Thu, 16 Aug 2007 19:33:43 +0000 (13:33 -0600)]
Begin added vertex shader state/support.
Renamed pipe_fs_state to pipe_shader_state since it can be used for both
vertex and fragment shader info.
Brian [Thu, 16 Aug 2007 19:12:24 +0000 (13:12 -0600)]
disable Z value scaling - it's done in sp_quad_depth_test.c
Brian [Thu, 16 Aug 2007 18:55:47 +0000 (12:55 -0600)]
move the draw_alloc/free_tmps() functions to draw_prim.c
Brian [Thu, 16 Aug 2007 18:52:20 +0000 (12:52 -0600)]
Remove GL/mesa types, rearrange things into more logical groups
michal [Thu, 16 Aug 2007 11:50:51 +0000 (12:50 +0100)]
Add missing inlcude directory.
michal [Thu, 16 Aug 2007 11:40:46 +0000 (12:40 +0100)]
Copy fragment z if the fragment shader does not write depth on its own.`
Brian [Thu, 16 Aug 2007 18:36:17 +0000 (12:36 -0600)]
Drawing code refactoring.
Move code duplicated between draw_vb.c and sp_draw_arrays.c into draw_prim.c
draw_vb.c will eventually go away, but this seems like a good step anyway.
Brian [Thu, 16 Aug 2007 18:35:13 +0000 (12:35 -0600)]
point/line/polygon drawing (factored out of draw_vb.c)
michal [Thu, 16 Aug 2007 11:17:30 +0000 (12:17 +0100)]
Silence warnings.
michal [Thu, 16 Aug 2007 11:16:57 +0000 (12:16 +0100)]
Silence warnings.
michal [Thu, 16 Aug 2007 11:16:27 +0000 (12:16 +0100)]
Silence warnings.
michal [Thu, 16 Aug 2007 11:13:37 +0000 (12:13 +0100)]
Silence warnings.
michal [Thu, 16 Aug 2007 11:12:14 +0000 (12:12 +0100)]
Use 'f' for float suffix.
Keith Whitwell [Wed, 15 Aug 2007 14:12:03 +0000 (15:12 +0100)]
Remove mesa include directories, be stricter about include paths.
Brian [Thu, 16 Aug 2007 01:23:58 +0000 (19:23 -0600)]
translate GL texture targets to PIPE_TEXTURE_x values
Brian [Thu, 16 Aug 2007 01:13:03 +0000 (19:13 -0600)]
added PIPE_PRIM_x tokens (matching GL), use in a few places
Brian [Thu, 16 Aug 2007 01:03:20 +0000 (19:03 -0600)]
Hook in new draw_arrays() code, disabled for now.
Brian [Thu, 16 Aug 2007 01:02:37 +0000 (19:02 -0600)]
softpipe_draw_arrays() function
Also includes:
Temporary stand-in for vertex program execution.
draw_prim() code
post-transform vertex cache
Brian [Thu, 16 Aug 2007 01:00:32 +0000 (19:00 -0600)]
added new draw_arrays()
Brian [Thu, 16 Aug 2007 01:00:06 +0000 (19:00 -0600)]
convert vbo->draw_prims() to pipe->draw_arrays(): works in very limited cases, disabled for now
Brian [Thu, 16 Aug 2007 00:54:05 +0000 (18:54 -0600)]
added vertex array info fields
Brian [Thu, 16 Aug 2007 00:53:37 +0000 (18:53 -0600)]
added draw_set_vertex_array_info()
Brian [Thu, 16 Aug 2007 00:53:00 +0000 (18:53 -0600)]
comment
michal [Wed, 15 Aug 2007 17:16:11 +0000 (18:16 +0100)]
Add UsageMask to DECLARATION in TGSI.
Interpolate FS attributes in the shader.
Do not copy WPOS in FS.
michal [Wed, 15 Aug 2007 12:55:22 +0000 (13:55 +0100)]
Add declaration_semantic token to TGSI.
Cosmetic changes, GLuint -> unsigned.
Preserve mesa gl_fragment_program DEPTH and COLOR semantics.
michal [Wed, 15 Aug 2007 12:08:40 +0000 (13:08 +0100)]
Declare fragment shader output registers.
michal [Wed, 15 Aug 2007 11:19:09 +0000 (12:19 +0100)]
Cleanup, do not use fp_attr_to_slot[] mapping array.
Brian [Wed, 15 Aug 2007 17:45:54 +0000 (11:45 -0600)]
sketch out vbo drawing function
Brian [Wed, 15 Aug 2007 17:45:12 +0000 (11:45 -0600)]
added state funcs for vertex buffer/element info
Brian [Wed, 15 Aug 2007 17:44:33 +0000 (11:44 -0600)]
softpipe vertex element/buffer state funcs
Brian [Wed, 15 Aug 2007 17:43:14 +0000 (11:43 -0600)]
comments
Brian [Wed, 15 Aug 2007 17:42:53 +0000 (11:42 -0600)]
added some const qualifiers
Brian [Wed, 15 Aug 2007 17:42:37 +0000 (11:42 -0600)]
comments, minor clean-ups
Brian [Tue, 14 Aug 2007 23:20:40 +0000 (17:20 -0600)]
use regular malloc/free instead of macros
Brian [Tue, 14 Aug 2007 21:58:56 +0000 (15:58 -0600)]
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Brian [Tue, 14 Aug 2007 21:42:40 +0000 (15:42 -0600)]
added glCopyPixels stub
Brian [Tue, 14 Aug 2007 21:37:45 +0000 (15:37 -0600)]
fix typo
Brian [Tue, 14 Aug 2007 21:20:00 +0000 (15:20 -0600)]
minor hack to allow 1D textures to work
Brian [Tue, 14 Aug 2007 21:19:37 +0000 (15:19 -0600)]
vars to test 1D/2D textures with linear/nearest filtering
Brian [Tue, 14 Aug 2007 21:12:04 +0000 (15:12 -0600)]
refactor some code - cube map textures work now
Brian [Tue, 14 Aug 2007 20:52:38 +0000 (14:52 -0600)]
Implement texture cache with multiple, direct-mapped entries.
Brian [Tue, 14 Aug 2007 19:32:19 +0000 (13:32 -0600)]
Consolidate filter and mipmap level selection in choose_mipmap_levels().
Brian [Tue, 14 Aug 2007 19:04:07 +0000 (13:04 -0600)]
Implement remaining mipmap modes for 2D textures.
Also, add lodbias param to get_samples()
Brian [Tue, 14 Aug 2007 17:00:35 +0000 (11:00 -0600)]
tgsi_sampler->get_samples() now operates on a quad (returns 4 colors).
Lambda/level-of-detail is also computed in get_samples() now.
Keith Whitwell [Tue, 14 Aug 2007 14:44:41 +0000 (15:44 +0100)]
Beginnings of a demand-filled post-tnl vertex cache.
Probably breaks a bit of stuff, eg unfilled clipping, edgeflags, etc.
Keith Whitwell [Tue, 14 Aug 2007 14:42:47 +0000 (15:42 +0100)]
Add structs and set-functions for vertex buffer, element state.
Not currently used.
Keith Whitwell [Tue, 14 Aug 2007 14:41:26 +0000 (15:41 +0100)]
Add surface formats to be used for specifying vertex element layouts.
Keith Whitwell [Mon, 13 Aug 2007 16:02:27 +0000 (17:02 +0100)]
Continue reducing dependencies on core mesa include files.
Mainly down to the support for legacy TNL processing now.
Brian [Tue, 14 Aug 2007 00:18:45 +0000 (18:18 -0600)]
added pixelzoom cmd line opt
Brian [Tue, 14 Aug 2007 00:16:47 +0000 (18:16 -0600)]
set renderbuffer Width/Height = texture size
Brian [Tue, 14 Aug 2007 00:16:11 +0000 (18:16 -0600)]
Added st_fb_orientation() function to determine the up/down orientation of the framebuffer.
Brian [Tue, 14 Aug 2007 00:14:54 +0000 (18:14 -0600)]
map stencil buffer too
Brian [Mon, 13 Aug 2007 22:18:32 +0000 (16:18 -0600)]
added assertion to check that texture width is non-zero
Brian [Mon, 13 Aug 2007 22:18:03 +0000 (16:18 -0600)]
fix up some render-to-texture code ... almost there
Brian [Mon, 13 Aug 2007 22:16:42 +0000 (16:16 -0600)]
added an assertion
Keith Whitwell [Mon, 13 Aug 2007 15:24:24 +0000 (16:24 +0100)]
Missing files
Keith Whitwell [Mon, 13 Aug 2007 15:07:11 +0000 (16:07 +0100)]
Start breaking the #include dependencies between pipe drivers and mesa.
Pipe drivers shouldn't really know much about mesa and certainly shouldn't
be #including files from src/mesa/main and the like.
I've also (in i915simple especially) moved over from GL types to
more conventional int/unsigned usage. This probably isn't really the
ultimate desired set of types to use - possibly C99 would be better. It
may even be that a subset of the GL types is preferable.
Brian [Mon, 13 Aug 2007 21:21:01 +0000 (15:21 -0600)]
check if we have a zbuf before enabling depth_test stage
Brian [Mon, 13 Aug 2007 21:20:08 +0000 (15:20 -0600)]
fix some issues with texture/mipmap_tree state tracking