X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Ftests%2Fgraw%2Ftri.c;h=2267d98a8feafa5fe1ea19dd4ca7a247c87e4259;hb=daa19363def83c025ccf16106b3402268bf1f56f;hp=fc5d66ad18fda694a6b499e00ffd9fceeaba70b1;hpb=dc4c821f0817a3db716f965692fb701079f66340;p=mesa.git diff --git a/src/gallium/tests/graw/tri.c b/src/gallium/tests/graw/tri.c index fc5d66ad18f..2267d98a8fe 100644 --- a/src/gallium/tests/graw/tri.c +++ b/src/gallium/tests/graw/tri.c @@ -3,36 +3,22 @@ */ #include +#include "graw_util.h" -#include "state_tracker/graw.h" -#include "pipe/p_screen.h" -#include "pipe/p_context.h" -#include "pipe/p_state.h" -#include "pipe/p_defines.h" - -#include "util/u_memory.h" /* Offset() */ -#include "util/u_draw_quad.h" - -enum pipe_format formats[] = { - PIPE_FORMAT_R8G8B8A8_UNORM, - PIPE_FORMAT_B8G8R8A8_UNORM, - PIPE_FORMAT_NONE -}; +static struct graw_info info; static const int WIDTH = 300; 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 *tex = NULL; -static void *window = NULL; struct vertex { float position[4]; float color[4]; }; +static boolean FlatShade = FALSE; + + static struct vertex vertices[3] = { { @@ -50,31 +36,6 @@ static struct vertex vertices[3] = }; - - -static void set_viewport( float x, float y, - float width, float height, - float near, float far) -{ - float z = far; - float half_width = (float)width / 2.0f; - float half_height = (float)height / 2.0f; - float half_depth = ((float)far - (float)near) / 2.0f; - struct pipe_viewport_state vp; - - vp.scale[0] = half_width; - vp.scale[1] = half_height; - vp.scale[2] = half_depth; - vp.scale[3] = 1.0f; - - vp.translate[0] = half_width + x; - vp.translate[1] = half_height + y; - vp.translate[2] = half_depth + z; - vp.translate[3] = 0.0f; - - ctx->set_viewport_state( ctx, &vp ); -} - static void set_vertices( void ) { struct pipe_vertex_element ve[2]; @@ -88,20 +49,23 @@ static void set_vertices( void ) ve[1].src_offset = Offset(struct vertex, color); ve[1].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT; - handle = ctx->create_vertex_elements_state(ctx, 2, ve); - ctx->bind_vertex_elements_state(ctx, handle); + handle = info.ctx->create_vertex_elements_state(info.ctx, 2, ve); + info.ctx->bind_vertex_elements_state(info.ctx, handle); + memset(&vbuf, 0, sizeof vbuf); vbuf.stride = sizeof( struct vertex ); vbuf.buffer_offset = 0; - vbuf.buffer = screen->user_buffer_create(screen, - vertices, - sizeof(vertices), - PIPE_BIND_VERTEX_BUFFER); + vbuf.buffer.resource = pipe_buffer_create_with_data(info.ctx, + PIPE_BIND_VERTEX_BUFFER, + PIPE_USAGE_DEFAULT, + sizeof(vertices), + vertices); - ctx->set_vertex_buffers(ctx, 1, &vbuf); + info.ctx->set_vertex_buffers(info.ctx, 0, 1, &vbuf); } + static void set_vertex_shader( void ) { void *handle; @@ -115,10 +79,11 @@ static void set_vertex_shader( void ) " 1: MOV OUT[0], IN[0]\n" " 2: END\n"; - handle = graw_parse_vertex_shader(ctx, text); - ctx->bind_vs_state(ctx, handle); + handle = graw_parse_vertex_shader(info.ctx, text); + info.ctx->bind_vs_state(info.ctx, handle); } + static void set_fragment_shader( void ) { void *handle; @@ -129,8 +94,8 @@ static void set_fragment_shader( void ) " 0: MOV OUT[0], IN[0]\n" " 1: END\n"; - handle = graw_parse_fragment_shader(ctx, text); - ctx->bind_fs_state(ctx, handle); + handle = graw_parse_fragment_shader(info.ctx, text); + info.ctx->bind_fs_state(info.ctx, handle); } @@ -138,113 +103,40 @@ static void draw( void ) { union pipe_color_union clear_color = { {1,0,1,1} }; - ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); - util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3); - ctx->flush(ctx, NULL); + info.ctx->clear(info.ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); + util_draw_arrays(info.ctx, PIPE_PRIM_TRIANGLES, 0, 3); + info.ctx->flush(info.ctx, NULL, 0); - graw_save_surface_to_file(ctx, surf, NULL); + graw_save_surface_to_file(info.ctx, info.color_surf[0], NULL); - screen->flush_frontbuffer(screen, tex, 0, 0, window); + graw_util_flush_front(&info); } static void init( void ) { - struct pipe_framebuffer_state fb; - struct pipe_resource templat; - struct pipe_surface surf_tmpl; - int i; - - /* It's hard to say whether window or screen should be created - * first. Different environments would prefer one or the other. - * - * Also, no easy way of querying supported formats if the screen - * cannot be created first. - */ - for (i = 0; formats[i] != PIPE_FORMAT_NONE; i++) { - screen = graw_create_window_and_screen(0, 0, 300, 300, - formats[i], - &window); - if (window && screen) - break; - } - if (!screen || !window) { - fprintf(stderr, "Unable to create window\n"); + if (!graw_util_create_window(&info, WIDTH, HEIGHT, 1, FALSE)) exit(1); - } - - ctx = screen->context_create(screen, NULL); - if (ctx == NULL) { - fprintf(stderr, "Unable to create context!\n"); - exit(3); - } - templat.target = PIPE_TEXTURE_2D; - templat.format = formats[i]; - templat.width0 = WIDTH; - templat.height0 = HEIGHT; - templat.depth0 = 1; - templat.array_size = 1; - templat.last_level = 0; - templat.nr_samples = 1; - templat.bind = (PIPE_BIND_RENDER_TARGET | - PIPE_BIND_DISPLAY_TARGET); - - tex = screen->resource_create(screen, - &templat); - if (tex == NULL) { - fprintf(stderr, "Unable to create screen texture!\n"); - exit(4); - } - - surf_tmpl.format = templat.format; - surf_tmpl.usage = PIPE_BIND_RENDER_TARGET; - surf_tmpl.u.tex.level = 0; - surf_tmpl.u.tex.first_layer = 0; - surf_tmpl.u.tex.last_layer = 0; - surf = ctx->create_surface(ctx, tex, &surf_tmpl); - if (surf == NULL) { - fprintf(stderr, "Unable to create tex surface!\n"); - exit(5); - } - - memset(&fb, 0, sizeof fb); - fb.nr_cbufs = 1; - fb.width = WIDTH; - fb.height = HEIGHT; - fb.cbufs[0] = surf; - - ctx->set_framebuffer_state(ctx, &fb); - - { - struct pipe_blend_state blend; - void *handle; - memset(&blend, 0, sizeof blend); - blend.rt[0].colormask = PIPE_MASK_RGBA; - handle = ctx->create_blend_state(ctx, &blend); - ctx->bind_blend_state(ctx, handle); - } - - { - struct pipe_depth_stencil_alpha_state depthstencil; - void *handle; - memset(&depthstencil, 0, sizeof depthstencil); - handle = ctx->create_depth_stencil_alpha_state(ctx, &depthstencil); - ctx->bind_depth_stencil_alpha_state(ctx, handle); - } + graw_util_default_state(&info, FALSE); { struct pipe_rasterizer_state rasterizer; void *handle; memset(&rasterizer, 0, sizeof rasterizer); rasterizer.cull_face = PIPE_FACE_NONE; - rasterizer.gl_rasterization_rules = 1; - rasterizer.depth_clip = 1; - handle = ctx->create_rasterizer_state(ctx, &rasterizer); - ctx->bind_rasterizer_state(ctx, handle); + rasterizer.half_pixel_center = 1; + rasterizer.bottom_edge_rule = 1; + rasterizer.flatshade = FlatShade; + rasterizer.depth_clip_near = 1; + rasterizer.depth_clip_far = 1; + handle = info.ctx->create_rasterizer_state(info.ctx, &rasterizer); + info.ctx->bind_rasterizer_state(info.ctx, handle); } - set_viewport(0, 0, WIDTH, HEIGHT, 30, 1000); + + graw_util_viewport(&info, 0, 0, WIDTH, HEIGHT, 30, 1000); + set_vertices(); set_vertex_shader(); set_fragment_shader(); @@ -254,11 +146,18 @@ static void args(int argc, char *argv[]) { int i; - for (i = 1; i < argc;) { + for (i = 1; i < argc; ) { if (graw_parse_args(&i, argc, argv)) { - continue; + /* ok */ + } + else if (strcmp(argv[i], "-f") == 0) { + FlatShade = TRUE; + i++; + } + else { + printf("Invalid arg %s\n", argv[i]); + exit(1); } - exit(1); } }