fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: Nuke r300_vbo.

Browse source
This commit is contained in:
Corbin Simpson 2009-12-18 13:40:24 -08:00
parent 263f4322e7
commit 62afcbb233
4 changed files with 8 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/r300/Makefile
View file

@ -17,7 +17,6 @@ C_SOURCES = \
r300_state.c \
r300_state_derived.c \
r300_state_invariant.c \
r300_vbo.c \
r300_vs.c \
r300_texture.c \
r300_tgsi_to_rc.c

10
src/gallium/drivers/r300/r300_render.c
View file

@ -37,7 +37,6 @@
#include "r300_reg.h"
#include "r300_render.h"
#include "r300_state_derived.h"
#include "r300_vbo.h"
/* r300_render: Vertex and index buffer primitive emission. */
#define R300_MAX_VBO_SIZE (1024 * 1024)
@ -196,7 +195,14 @@ boolean r300_draw_range_elements(struct pipe_context* pipe,
return FALSE;
}
setup_index_buffer(r300, indexBuffer, indexSize);
if (!r300->winsys->add_buffer(r300->winsys, indexBuffer,
RADEON_GEM_DOMAIN_GTT, 0)) {
assert(0);
}
if (!r300->winsys->validate(r300->winsys)) {
assert(0);
}
r300_emit_dirty_state(r300);

87
src/gallium/drivers/r300/r300_vbo.c
View file

@ -1,87 +0,0 @@
/*
* Copyright 2009 Maciej Cencora <m.cencora@gmail.com>
*
* 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
* on 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 NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHOR(S) AND/OR THEIR 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.
*/
/* r300_vbo: Various helpers for emitting vertex buffers. Needs cleanup,
* refactoring, etc. */
#include "r300_vbo.h"
#include "pipe/p_format.h"
#include "r300_cs.h"
#include "r300_context.h"
#include "r300_state_inlines.h"
#include "r300_reg.h"
#include "radeon_winsys.h"
static INLINE int get_buffer_offset(struct r300_context *r300,
unsigned int buf_nr,
unsigned int elem_offset)
{
return r300->vertex_buffer[buf_nr].buffer_offset + elem_offset;
}
#if 0
/* XXX not called at all */
static void setup_vertex_buffers(struct r300_context *r300)
{
struct pipe_vertex_element *vert_elem;
int i;
for (i = 0; i < r300->aos_count; i++)
{
vert_elem = &r300->vertex_element[i];
/* XXX use translate module to convert the data */
if (!format_is_supported(vert_elem->src_format,
vert_elem->nr_components)) {
assert(0);
/*
struct pipe_buffer *buf;
const unsigned int max_index = r300->vertex_buffers[vert_elem->vertex_buffer_index].max_index;
buf = pipe_buffer_create(r300->context.screen, 4, usage, vert_elem->nr_components * max_index * sizeof(float));
*/
}
if (get_buffer_offset(r300,
vert_elem->vertex_buffer_index,
vert_elem->src_offset) % 4) {
/* XXX need to align buffer */
assert(0);
}
}
}
#endif
/* XXX these shouldn't be asserts since we can work around bad indexbufs */
void setup_index_buffer(struct r300_context *r300,
struct pipe_buffer* indexBuffer,
unsigned indexSize)
{
if (!r300->winsys->add_buffer(r300->winsys, indexBuffer,
RADEON_GEM_DOMAIN_GTT, 0)) {
assert(0);
}
if (!r300->winsys->validate(r300->winsys)) {
assert(0);
}
}

36
src/gallium/drivers/r300/r300_vbo.h
View file

@ -1,36 +0,0 @@
/*
* Copyright 2009 Maciej Cencora <m.cencora@gmail.com>
*
* 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
* on 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 NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHOR(S) AND/OR THEIR 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 R300_VBO_H
#define R300_VBO_H
struct r300_context;
struct pipe_buffer;
void setup_vertex_attributes(struct r300_context *r300);
void setup_index_buffer(struct r300_context *r300,
struct pipe_buffer* indexBuffer,
unsigned indexSize);
#endif