KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graw/tests: Use pipe_context::draw_vbo. 

The other drawing variants such as draw_arrays or
draw_elements_instanced were removed.

This fixes fdo bug #29287.
This commit is contained in:
Chia-I Wu 2010-07-29 16:04:28 +08:00
parent 92f9b05499
commit d4d62b6178
7 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/tests/graw/fs-test.c
View File

@ -13,6 +13,7 @@
#include "util/u_debug.h" /* debug_dump_surface_bmp() */
#include "util/u_inlines.h"
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
#include "util/u_box.h"
static const char *filename = NULL;
@ -275,7 +276,7 @@ static void draw( void )
float clear_color[4] = {.1,.3,.5,0};
ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
ctx->draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
#if 0

5
src/gallium/tests/graw/gs-test.c
View File

@ -13,6 +13,7 @@
#include "util/u_debug.h" /* debug_dump_surface_bmp() */
#include "util/u_inlines.h"
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
#include "util/u_box.h"
static const char *filename = NULL;
@ -336,9 +337,9 @@ static void draw( void )
ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
if (draw_strip)
ctx->draw_arrays(ctx, PIPE_PRIM_TRIANGLE_STRIP, 0, 4);
util_draw_arrays(ctx, PIPE_PRIM_TRIANGLE_STRIP, 0, 4);
else
ctx->draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);

3
src/gallium/tests/graw/quad-tex.c
View File

@ -12,6 +12,7 @@
#include "util/u_debug.h" /* debug_dump_surface_bmp() */
#include "util/u_inlines.h"
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
#include "util/u_box.h"
enum pipe_format formats[] = {
@ -146,7 +147,7 @@ static void draw( void )
float clear_color[4] = {.5,.5,.5,1};
ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
ctx->draw_arrays(ctx, PIPE_PRIM_QUADS, 0, 4);
util_draw_arrays(ctx, PIPE_PRIM_QUADS, 0, 4);
ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
#if 0

3
src/gallium/tests/graw/tri-gs.c
View File

@ -10,6 +10,7 @@
#include "util/u_debug.h" /* debug_dump_surface_bmp() */
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
enum pipe_format formats[] = {
PIPE_FORMAT_R8G8B8A8_UNORM,
@ -161,7 +162,7 @@ static void draw( void )
float clear_color[4] = {1,0,1,1};
ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
ctx->draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
screen->flush_frontbuffer(screen, surf, window);

25
src/gallium/tests/graw/tri-instanced.c
View File

@ -13,6 +13,7 @@
#include "util/u_debug.h" /* debug_dump_surface_bmp() */
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
enum pipe_format formats[] = {
@ -27,7 +28,6 @@ static const int HEIGHT = 300;
static struct pipe_screen *screen = NULL;
static struct pipe_context *ctx = NULL;
static struct pipe_surface *surf = NULL;
static struct pipe_resource *indexBuffer = NULL;
static void *window = NULL;
struct vertex {
@ -105,6 +105,7 @@ static void set_vertices( void )
{
struct pipe_vertex_element ve[3];
struct pipe_vertex_buffer vbuf[2];
struct pipe_index_buffer ibuf;
void *handle;
memset(ve, 0, sizeof ve);
@ -151,11 +152,14 @@ static void set_vertices( void )
ctx->set_vertex_buffers(ctx, 2, vbuf);
/* index data */
indexBuffer = screen->user_buffer_create(screen,
ibuf.buffer = screen->user_buffer_create(screen,
indices,
sizeof(indices),
PIPE_BIND_VERTEX_BUFFER);
ibuf.offset = 0;
ibuf.index_size = 2;
ctx->set_index_buffer(ctx, &ibuf);
}
@ -195,18 +199,19 @@ static void set_fragment_shader( void )
static void draw( void )
{
float clear_color[4] = {1,0,1,1};
struct pipe_draw_info info;
ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
util_draw_init_info(&info);
info.indexed = (draw_elements != 0);
info.mode = PIPE_PRIM_TRIANGLES;
info.start = 0;
info.count = 3;
/* draw NUM_INST triangles */
if (draw_elements)
ctx->draw_elements_instanced(ctx, indexBuffer, 2,
0, /* indexBias */
PIPE_PRIM_TRIANGLES,
0, 3, /* start, count */
0, NUM_INST); /* startInst, instCount */
else
ctx->draw_arrays_instanced(ctx, PIPE_PRIM_TRIANGLES, 0, 3, 0, NUM_INST);
info.instance_count = NUM_INST;
ctx->draw_vbo(ctx, &info);
ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);

3
src/gallium/tests/graw/tri.c
View File

@ -10,6 +10,7 @@
#include "util/u_debug.h" /* debug_dump_surface_bmp() */
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
enum pipe_format formats[] = {
PIPE_FORMAT_R8G8B8A8_UNORM,
@ -134,7 +135,7 @@ static void draw( void )
float clear_color[4] = {1,0,1,1};
ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
ctx->draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
#if 0

3
src/gallium/tests/graw/vs-test.c
View File

@ -14,6 +14,7 @@
#include "util/u_debug.h" /* debug_dump_surface_bmp() */
#include "util/u_inlines.h"
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
#include "util/u_box.h"
static const char *filename = NULL;
@ -226,7 +227,7 @@ static void draw( void )
float clear_color[4] = {.1,.3,.5,0};
ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
ctx->draw_arrays(ctx, PIPE_PRIM_POINTS, 0, Elements(vertices));
util_draw_arrays(ctx, PIPE_PRIM_POINTS, 0, Elements(vertices));
ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
#if 0