X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgallium%2Ftests%2Fgraw%2Ftri-instanced.c;h=297377b894e26f35575e4c814d132a38052ddf1d;hb=daa19363def83c025ccf16106b3402268bf1f56f;hp=f33c061b22b861c72c2d49578f2f70aa6a7194ae;hpb=0f68236a2487dbeb0396b996debcda595b0b54a1;p=mesa.git diff --git a/src/gallium/tests/graw/tri-instanced.c b/src/gallium/tests/graw/tri-instanced.c index f33c061b22b..297377b894e 100644 --- a/src/gallium/tests/graw/tri-instanced.c +++ b/src/gallium/tests/graw/tri-instanced.c @@ -13,11 +13,12 @@ #include "util/u_memory.h" /* Offset() */ #include "util/u_draw_quad.h" +#include "util/u_inlines.h" enum pipe_format formats[] = { - PIPE_FORMAT_R8G8B8A8_UNORM, - PIPE_FORMAT_B8G8R8A8_UNORM, + PIPE_FORMAT_RGBA8888_UNORM, + PIPE_FORMAT_BGRA8888_UNORM, PIPE_FORMAT_NONE }; @@ -79,25 +80,23 @@ static ushort indices[3] = { 0, 2, 1 }; static void set_viewport( float x, float y, float width, float height, - float near, float far) + float zNear, float zFar) { - float z = far; + float z = zFar; float half_width = (float)width / 2.0f; float half_height = (float)height / 2.0f; - float half_depth = ((float)far - (float)near) / 2.0f; + float half_depth = ((float)zFar - (float)zNear) / 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 ); + ctx->set_viewport_states( ctx, 0, 1, &vp ); } @@ -105,7 +104,6 @@ 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); @@ -129,38 +127,27 @@ static void set_vertices( void ) handle = ctx->create_vertex_elements_state(ctx, 3, ve); ctx->bind_vertex_elements_state(ctx, handle); + memset(&vbuf, 0, sizeof vbuf); /* vertex data */ vbuf[0].stride = sizeof( struct vertex ); - vbuf[0].max_index = sizeof(vertices) / vbuf[0].stride; vbuf[0].buffer_offset = 0; - vbuf[0].buffer = screen->user_buffer_create(screen, - vertices, - sizeof(vertices), - PIPE_BIND_VERTEX_BUFFER); + vbuf[0].buffer.resource = pipe_buffer_create_with_data(ctx, + PIPE_BIND_VERTEX_BUFFER, + PIPE_USAGE_DEFAULT, + sizeof(vertices), + vertices); /* instance data */ vbuf[1].stride = sizeof( inst_data[0] ); - vbuf[1].max_index = sizeof(inst_data) / vbuf[1].stride; vbuf[1].buffer_offset = 0; - vbuf[1].buffer = screen->user_buffer_create(screen, - inst_data, - sizeof(inst_data), - PIPE_BIND_VERTEX_BUFFER); - - - ctx->set_vertex_buffers(ctx, 2, vbuf); - - /* index data */ - 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); + vbuf[1].buffer.resource = pipe_buffer_create_with_data(ctx, + PIPE_BIND_VERTEX_BUFFER, + PIPE_USAGE_DEFAULT, + sizeof(inst_data), + inst_data); + ctx->set_vertex_buffers(ctx, 0, 2, vbuf); } static void set_vertex_shader( void ) @@ -198,26 +185,39 @@ static void set_fragment_shader( void ) static void draw( void ) { - float clear_color[4] = {1,0,1,1}; + union pipe_color_union clear_color = { {1,0,1,1} }; struct pipe_draw_info info; - ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0); + ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); + util_draw_init_info(&info); - info.indexed = (draw_elements != 0); + info.index_size = draw_elements ? 2 : 0; info.mode = PIPE_PRIM_TRIANGLES; info.start = 0; info.count = 3; /* draw NUM_INST triangles */ info.instance_count = NUM_INST; + /* index data */ + if (info.index_size) { + info.index.resource = + pipe_buffer_create_with_data(ctx, + PIPE_BIND_INDEX_BUFFER, + PIPE_USAGE_DEFAULT, + sizeof(indices), + indices); + } + ctx->draw_vbo(ctx, &info); - ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL); + pipe_resource_reference(&info.index.resource, NULL); + + ctx->flush(ctx, NULL, 0); graw_save_surface_to_file(ctx, surf, NULL); - screen->flush_frontbuffer(screen, tex, 0, 0, window); + screen->flush_frontbuffer(screen, tex, 0, 0, window, NULL); } @@ -234,19 +234,23 @@ static void init( void ) * Also, no easy way of querying supported formats if the screen * cannot be created first. */ - for (i = 0; - window == NULL && formats[i] != PIPE_FORMAT_NONE; - i++) { - - screen = graw_create_window_and_screen(0,0,300,300, + 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"); + exit(1); } - ctx = screen->context_create(screen, NULL); + ctx = screen->context_create(screen, NULL, 0); if (ctx == NULL) exit(3); + memset(&templat, 0, sizeof(templat)); templat.target = PIPE_TEXTURE_2D; templat.format = formats[i]; templat.width0 = WIDTH; @@ -254,7 +258,6 @@ static void init( void ) 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); @@ -264,7 +267,6 @@ static void init( void ) 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; @@ -302,7 +304,10 @@ static void init( void ) void *handle; memset(&rasterizer, 0, sizeof rasterizer); rasterizer.cull_face = PIPE_FACE_NONE; - rasterizer.gl_rasterization_rules = 1; + rasterizer.half_pixel_center = 1; + rasterizer.bottom_edge_rule = 1; + rasterizer.depth_clip_near = 1; + rasterizer.depth_clip_far = 1; handle = ctx->create_rasterizer_state(ctx, &rasterizer); ctx->bind_rasterizer_state(ctx, handle); }