mesa.git
17 years agoremove the -DMESA flags
Brian [Mon, 20 Aug 2007 23:02:27 +0000 (17:02 -0600)]
remove the -DMESA flags

17 years agoremove some of the #ifndef MESA stuff
Brian [Mon, 20 Aug 2007 23:02:07 +0000 (17:02 -0600)]
remove some of the #ifndef MESA stuff

17 years agoObsolete
Brian [Mon, 20 Aug 2007 22:48:55 +0000 (16:48 -0600)]
Obsolete

17 years agoremove dead code related to vf module
Brian [Mon, 20 Aug 2007 22:43:58 +0000 (16:43 -0600)]
remove dead code related to vf module

17 years agoCheckpoint: remove more of the old draw_vb() code.
Brian [Mon, 20 Aug 2007 22:31:12 +0000 (16:31 -0600)]
Checkpoint: remove more of the old draw_vb() code.

17 years agoStart to remove the temporary draw_vb() and draw_vertices() code.
Brian [Mon, 20 Aug 2007 22:21:08 +0000 (16:21 -0600)]
Start to remove the temporary draw_vb() and draw_vertices() code.

new st_draw_vertices() utility used by glClear and glDrawPixels

17 years agoMove guts of vertex array drawing into the 'draw' module.
Brian [Mon, 20 Aug 2007 21:11:11 +0000 (15:11 -0600)]
Move guts of vertex array drawing into the 'draw' module.

17 years agoimplement DrawElements, still some rough spots
Brian [Mon, 20 Aug 2007 18:52:33 +0000 (12:52 -0600)]
implement DrawElements, still some rough spots

17 years agoimplement draw_elements()
Brian [Mon, 20 Aug 2007 18:52:00 +0000 (12:52 -0600)]
implement draw_elements()

17 years agodon't map element buffer in _mesa_validate_DrawElements() unless necessary
Brian [Mon, 20 Aug 2007 18:50:34 +0000 (12:50 -0600)]
don't map element buffer in _mesa_validate_DrawElements() unless necessary

17 years agoremove debug printf
Brian [Mon, 20 Aug 2007 17:53:36 +0000 (11:53 -0600)]
remove debug printf

17 years agocall draw_trim()
Brian [Mon, 20 Aug 2007 17:49:16 +0000 (11:49 -0600)]
call draw_trim()

17 years agofix cache overflow bug in get_vertex()
Brian [Mon, 20 Aug 2007 17:41:23 +0000 (11:41 -0600)]
fix cache overflow bug in get_vertex()

17 years agofix VBO clean-up in vbo_exec_vtx_destroy()
Brian [Mon, 20 Aug 2007 17:05:35 +0000 (11:05 -0600)]
fix VBO clean-up in vbo_exec_vtx_destroy()

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

17 years agoFix some draw_arrays issues.
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.

17 years agomore work on vertex shaders, now using vertex shaders instead of TnL module by default
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

17 years agoCreate a default vertex attribute buffer which mirrors ctx->Current.Attrrib[]
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.

17 years agoadded tnl state atom
Brian [Sat, 18 Aug 2007 15:04:49 +0000 (16:04 +0100)]
added tnl state atom

17 years agofix xm_buffer_data
Brian [Sat, 18 Aug 2007 08:22:15 +0000 (09:22 +0100)]
fix xm_buffer_data

17 years agoreplace memcpy() with assignment, better type safety
Brian [Fri, 17 Aug 2007 18:40:35 +0000 (12:40 -0600)]
replace memcpy() with assignment, better type safety

17 years agoadded CLIP_x_SHIFT vals
Brian [Fri, 17 Aug 2007 18:34:40 +0000 (12:34 -0600)]
added CLIP_x_SHIFT vals

17 years agowrite outputs according to vs.outputs_written
Brian [Fri, 17 Aug 2007 18:31:13 +0000 (12:31 -0600)]
write outputs according to vs.outputs_written

17 years agoadded outputs_written field to pipe_shader_state
Brian [Fri, 17 Aug 2007 18:30:30 +0000 (12:30 -0600)]
added outputs_written field to pipe_shader_state

17 years agoload machine.Inputs based on vs.inputs_read
Brian [Fri, 17 Aug 2007 18:23:26 +0000 (12:23 -0600)]
load machine.Inputs based on vs.inputs_read

17 years agoadded pipe ptr to draw_context
Brian [Fri, 17 Aug 2007 18:19:40 +0000 (12:19 -0600)]
added pipe ptr to draw_context

17 years agocompute clipmask
Brian [Fri, 17 Aug 2007 18:09:50 +0000 (12:09 -0600)]
compute clipmask

17 years agodefine CLIP_LEFT/RIGHT etc
Brian [Fri, 17 Aug 2007 18:09:31 +0000 (12:09 -0600)]
define CLIP_LEFT/RIGHT etc

17 years agoshade four vertices at a time
Brian [Fri, 17 Aug 2007 17:40:53 +0000 (11:40 -0600)]
shade four vertices at a time

17 years agoadded align16() function
Brian [Fri, 17 Aug 2007 17:40:06 +0000 (11:40 -0600)]
added align16() function

17 years agoadded uint64 type
Brian [Fri, 17 Aug 2007 17:39:45 +0000 (11:39 -0600)]
added uint64 type

17 years agoadded null VB->AttribPtr[i] check
Brian [Fri, 17 Aug 2007 14:38:29 +0000 (15:38 +0100)]
added null VB->AttribPtr[i] check

17 years agofix edgeflag bug
Brian [Fri, 17 Aug 2007 14:37:22 +0000 (15:37 +0100)]
fix edgeflag bug

17 years agopack output vertex attributes in sequential slots
Brian [Fri, 17 Aug 2007 14:28:17 +0000 (15:28 +0100)]
pack output vertex attributes in sequential slots

17 years agotell vbo module to use bufferobjs
Brian [Fri, 17 Aug 2007 14:27:18 +0000 (15:27 +0100)]
tell vbo module to use bufferobjs

17 years agoadded call to _mesa_load_state_parameters()
Brian [Fri, 17 Aug 2007 14:27:00 +0000 (15:27 +0100)]
added call to _mesa_load_state_parameters()

17 years agoadded vbo_use_buffer_objects() to specify that immediate mode data should be put...
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

17 years agoreplace assertion w/ conditionals in xmesa_clear()
Brian [Fri, 17 Aug 2007 09:50:06 +0000 (10:50 +0100)]
replace assertion w/ conditionals in xmesa_clear()

17 years agoUse simple st->pipe->clear() in more cases for depth/stencil clears.
Brian [Fri, 17 Aug 2007 09:49:36 +0000 (10:49 +0100)]
Use simple st->pipe->clear() in more cases for depth/stencil clears.

17 years agofix buffer clearing problems
Brian [Fri, 17 Aug 2007 09:28:20 +0000 (10:28 +0100)]
fix buffer clearing problems

17 years agoassertions
Brian [Fri, 17 Aug 2007 09:27:53 +0000 (10:27 +0100)]
assertions

17 years agoadded assertions, disable debug output
Brian [Fri, 17 Aug 2007 09:27:37 +0000 (10:27 +0100)]
added assertions, disable debug output

17 years agoBreak mesa dependencies.
michal [Thu, 16 Aug 2007 18:50:08 +0000 (19:50 +0100)]
Break mesa dependencies.
Silence compiler warnings.

17 years agoSilence compiler warnings.
michal [Thu, 16 Aug 2007 18:49:04 +0000 (19:49 +0100)]
Silence compiler warnings.

17 years agoBreak mesa dependencies.
michal [Thu, 16 Aug 2007 18:47:18 +0000 (19:47 +0100)]
Break mesa dependencies.
Silence compiler warnings.

17 years agoSilence compiler warnings.
michal [Thu, 16 Aug 2007 18:45:55 +0000 (19:45 +0100)]
Silence compiler warnings.

17 years agoDefine ffs() for __WIN32__ & __MSC__.
michal [Thu, 16 Aug 2007 18:44:53 +0000 (19:44 +0100)]
Define ffs() for __WIN32__ & __MSC__.
Break mesa dependencies.

17 years agoDefine __WIN32__.
michal [Thu, 16 Aug 2007 18:42:28 +0000 (19:42 +0100)]
Define __WIN32__.

17 years agoMove VS code from st_atom_fs.c to st_atom_vs.c.
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.

17 years agoCosmetic changes.
michal [Thu, 16 Aug 2007 17:16:32 +0000 (18:16 +0100)]
Cosmetic changes.

17 years agoRemove many dependencies on mesa headers.
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.

17 years agomisc changes to support vertex shaders (disabled by default)
Brian [Thu, 16 Aug 2007 23:33:49 +0000 (17:33 -0600)]
misc changes to support vertex shaders (disabled by default)

17 years agorun real vertex shaders, a total hack for now
Brian [Thu, 16 Aug 2007 23:33:05 +0000 (17:33 -0600)]
run real vertex shaders, a total hack for now

17 years agomake pass-through vertex shader
Brian [Thu, 16 Aug 2007 23:32:24 +0000 (17:32 -0600)]
make pass-through vertex shader

17 years agocheck for null swrast (pipe work-around)
Brian [Thu, 16 Aug 2007 23:30:38 +0000 (17:30 -0600)]
check for null swrast (pipe work-around)

17 years agoBegin added vertex shader state/support.
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.

17 years agodisable Z value scaling - it's done in sp_quad_depth_test.c
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

17 years agomove the draw_alloc/free_tmps() functions to draw_prim.c
Brian [Thu, 16 Aug 2007 18:55:47 +0000 (12:55 -0600)]
move the draw_alloc/free_tmps() functions to draw_prim.c

17 years agoRemove GL/mesa types, rearrange things into more logical groups
Brian [Thu, 16 Aug 2007 18:52:20 +0000 (12:52 -0600)]
Remove GL/mesa types, rearrange things into more logical groups

17 years agoAdd missing inlcude directory.
michal [Thu, 16 Aug 2007 11:50:51 +0000 (12:50 +0100)]
Add missing inlcude directory.

17 years agoCopy fragment z if the fragment shader does not write depth on its own.`
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.`

17 years agoDrawing code refactoring.
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.

17 years agopoint/line/polygon drawing (factored out of draw_vb.c)
Brian [Thu, 16 Aug 2007 18:35:13 +0000 (12:35 -0600)]
point/line/polygon drawing (factored out of draw_vb.c)

17 years agoSilence warnings.
michal [Thu, 16 Aug 2007 11:17:30 +0000 (12:17 +0100)]
Silence warnings.

17 years agoSilence warnings.
michal [Thu, 16 Aug 2007 11:16:57 +0000 (12:16 +0100)]
Silence warnings.

17 years agoSilence warnings.
michal [Thu, 16 Aug 2007 11:16:27 +0000 (12:16 +0100)]
Silence warnings.

17 years agoSilence warnings.
michal [Thu, 16 Aug 2007 11:13:37 +0000 (12:13 +0100)]
Silence warnings.

17 years agoUse 'f' for float suffix.
michal [Thu, 16 Aug 2007 11:12:14 +0000 (12:12 +0100)]
Use 'f' for float suffix.

17 years agoRemove mesa include directories, be stricter about include paths.
Keith Whitwell [Wed, 15 Aug 2007 14:12:03 +0000 (15:12 +0100)]
Remove mesa include directories, be stricter about include paths.

17 years agotranslate GL texture targets to PIPE_TEXTURE_x values
Brian [Thu, 16 Aug 2007 01:23:58 +0000 (19:23 -0600)]
translate GL texture targets to PIPE_TEXTURE_x values

17 years agoadded PIPE_PRIM_x tokens (matching GL), use in a few places
Brian [Thu, 16 Aug 2007 01:13:03 +0000 (19:13 -0600)]
added PIPE_PRIM_x tokens (matching GL), use in a few places

17 years agoHook in new draw_arrays() code, disabled for now.
Brian [Thu, 16 Aug 2007 01:03:20 +0000 (19:03 -0600)]
Hook in new draw_arrays() code, disabled for now.

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

17 years agoadded new draw_arrays()
Brian [Thu, 16 Aug 2007 01:00:32 +0000 (19:00 -0600)]
added new draw_arrays()

17 years agoconvert vbo->draw_prims() to pipe->draw_arrays(): works in very limited cases, disabl...
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

17 years agoadded vertex array info fields
Brian [Thu, 16 Aug 2007 00:54:05 +0000 (18:54 -0600)]
added vertex array info fields

17 years agoadded draw_set_vertex_array_info()
Brian [Thu, 16 Aug 2007 00:53:37 +0000 (18:53 -0600)]
added draw_set_vertex_array_info()

17 years agocomment
Brian [Thu, 16 Aug 2007 00:53:00 +0000 (18:53 -0600)]
comment

17 years agoAdd UsageMask to DECLARATION in TGSI.
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.

17 years agoAdd declaration_semantic token to TGSI.
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.

17 years agoDeclare fragment shader output registers.
michal [Wed, 15 Aug 2007 12:08:40 +0000 (13:08 +0100)]
Declare fragment shader output registers.

17 years agoCleanup, do not use fp_attr_to_slot[] mapping array.
michal [Wed, 15 Aug 2007 11:19:09 +0000 (12:19 +0100)]
Cleanup, do not use fp_attr_to_slot[] mapping array.

17 years agosketch out vbo drawing function
Brian [Wed, 15 Aug 2007 17:45:54 +0000 (11:45 -0600)]
sketch out vbo drawing function

17 years agoadded state funcs for vertex buffer/element info
Brian [Wed, 15 Aug 2007 17:45:12 +0000 (11:45 -0600)]
added state funcs for vertex buffer/element info

17 years agosoftpipe vertex element/buffer state funcs
Brian [Wed, 15 Aug 2007 17:44:33 +0000 (11:44 -0600)]
softpipe vertex element/buffer state funcs

17 years agocomments
Brian [Wed, 15 Aug 2007 17:43:14 +0000 (11:43 -0600)]
comments

17 years agoadded some const qualifiers
Brian [Wed, 15 Aug 2007 17:42:53 +0000 (11:42 -0600)]
added some const qualifiers

17 years agocomments, minor clean-ups
Brian [Wed, 15 Aug 2007 17:42:37 +0000 (11:42 -0600)]
comments, minor clean-ups

17 years agouse regular malloc/free instead of macros
Brian [Tue, 14 Aug 2007 23:20:40 +0000 (17:20 -0600)]
use regular malloc/free instead of macros

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

17 years agoadded glCopyPixels stub
Brian [Tue, 14 Aug 2007 21:42:40 +0000 (15:42 -0600)]
added glCopyPixels stub

17 years agofix typo
Brian [Tue, 14 Aug 2007 21:37:45 +0000 (15:37 -0600)]
fix typo

17 years agominor hack to allow 1D textures to work
Brian [Tue, 14 Aug 2007 21:20:00 +0000 (15:20 -0600)]
minor hack to allow 1D textures to work

17 years agovars to test 1D/2D textures with linear/nearest filtering
Brian [Tue, 14 Aug 2007 21:19:37 +0000 (15:19 -0600)]
vars to test 1D/2D textures with linear/nearest filtering

17 years agorefactor some code - cube map textures work now
Brian [Tue, 14 Aug 2007 21:12:04 +0000 (15:12 -0600)]
refactor some code - cube map textures work now

17 years agoImplement texture cache with multiple, direct-mapped entries.
Brian [Tue, 14 Aug 2007 20:52:38 +0000 (14:52 -0600)]
Implement texture cache with multiple, direct-mapped entries.

17 years agoConsolidate filter and mipmap level selection in choose_mipmap_levels().
Brian [Tue, 14 Aug 2007 19:32:19 +0000 (13:32 -0600)]
Consolidate filter and mipmap level selection in choose_mipmap_levels().

17 years agoImplement remaining mipmap modes for 2D textures.
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()

17 years agotgsi_sampler->get_samples() now operates on a quad (returns 4 colors).
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.

17 years agoBeginnings of a demand-filled post-tnl vertex cache.
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.