fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

clean-up comments, code

Browse source
This commit is contained in:
Brian 2008-01-10 10:22:01 -07:00
parent ede7b00b59
commit fd8b5ede95
3 changed files with 63 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/pipe/softpipe/sp_context.c
View file

@ -345,7 +345,7 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
if (GETENV( "SP_VBUF" ) != NULL) {
softpipe->vbuf = sp_draw_vbuf_stage(softpipe->draw,
&softpipe->pipe,
sp_vbuf_setup_draw);
sp_vbuf_render);
draw_set_rasterize_stage(softpipe->draw, softpipe->vbuf);
}

16
src/mesa/pipe/softpipe/sp_prim_setup.c
View file

@ -1286,18 +1286,20 @@ static void calc_det( struct prim_header *header )
/* Test harness - feed vertex buffer back into prim pipeline.
/**
* Render buffer of points/lines/triangles.
* Called by vbuf code when the vertex or index buffer is filled.
*
* The big issue at this point is that reset_stipple doesn't make it
* through the interface. Probably need to split primitives at reset
* stipple, perhaps using the ~0 index marker.
*/
void sp_vbuf_setup_draw( struct pipe_context *pipe,
unsigned primitive,
const ushort *elements,
unsigned nr_elements,
const void *vertex_buffer,
unsigned nr_vertices )
void sp_vbuf_render( struct pipe_context *pipe,
unsigned primitive,
const ushort *elements,
unsigned nr_elements,
const void *vertex_buffer,
unsigned nr_vertices )
{
struct softpipe_context *softpipe = softpipe_context( pipe );
struct setup_stage *setup = setup_stage( softpipe->setup );

99
src/mesa/pipe/softpipe/sp_prim_setup.h
View file

@ -1,33 +1,49 @@
/*
* Mesa 3-D graphics library
* Version: 6.5
*
* Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
*
/**************************************************************************
*
* Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#ifndef SP_PRIM_SETUP_H
#define SP_PRIM_SETUP_H
/* Vertices are just an array of floats, with all the attributes
/**
* vbuf is a special stage to gather the stream of triangles, lines, points
* together and reconstruct vertex buffers for hardware upload.
*
* First attempt, work in progress.
*
* TODO:
* - separate out vertex buffer building and primitive emit, ie >1 draw per vb.
* - tell vbuf stage how to build hw vertices directly
* - pass vbuf stage a buffer pointer for direct emit to agp/vram.
*
*
*
* Vertices are just an array of floats, with all the attributes
* packed. We currently assume a layout like:
*
* attr[0][0..3] - window position
@ -37,23 +53,11 @@
* all the enabled attributes run contiguously.
*/
struct draw_stage;
struct softpipe_context;
extern struct draw_stage *sp_draw_render_stage( struct softpipe_context *softpipe );
/* A special stage to gather the stream of triangles, lines, points
* together and reconstruct vertex buffers for hardware upload.
*
* First attempt, work in progress.
*
* TODO:
* - separate out vertex buffer building and primitive emit, ie >1 draw per vb.
* - tell vbuf stage how to build hw vertices directly
* - pass vbuf stage a buffer pointer for direct emit to agp/vram.
*/
typedef void (*vbuf_draw_func)( struct pipe_context *pipe,
unsigned prim,
const ushort *elements,
@ -62,20 +66,23 @@ typedef void (*vbuf_draw_func)( struct pipe_context *pipe,
unsigned nr_vertices );
extern struct draw_stage *sp_draw_vbuf_stage( struct draw_context *draw_context,
struct pipe_context *pipe,
vbuf_draw_func draw );
extern struct draw_stage *
sp_draw_render_stage( struct softpipe_context *softpipe );
extern struct draw_stage *
sp_draw_vbuf_stage( struct draw_context *draw_context,
struct pipe_context *pipe,
vbuf_draw_func draw );
/* Test harness
*/
void sp_vbuf_setup_draw( struct pipe_context *pipe,
unsigned prim,
const ushort *elements,
unsigned nr_elements,
const void *vertex_buffer,
unsigned nr_vertices );
extern void
sp_vbuf_render( struct pipe_context *pipe,
unsigned prim,
const ushort *elements,
unsigned nr_elements,
const void *vertex_buffer,
unsigned nr_vertices );