#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
+#include "util/u_inlines.h"
static int num_iters = 100;
enum pipe_format formats[] = {
- PIPE_FORMAT_R8G8B8A8_UNORM,
- PIPE_FORMAT_B8G8R8A8_UNORM,
+ PIPE_FORMAT_RGBA8888_UNORM,
+ PIPE_FORMAT_BGRA8888_UNORM,
PIPE_FORMAT_NONE
};
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 );
}
static void set_vertices( void )
handle = ctx->create_vertex_elements_state(ctx, 2, ve);
ctx->bind_vertex_elements_state(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(ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_DEFAULT,
+ sizeof(vertices),
+ vertices);
- ctx->set_vertex_buffers(ctx, 1, &vbuf);
+ ctx->set_vertex_buffers(ctx, 0, 1, &vbuf);
}
static void set_vertex_shader( void )
static void draw( void )
{
- union pipe_color_union clear_color = { .f = {0,0,0,1} };
+ union pipe_color_union clear_color = { {0,0,0,1} };
int i;
printf("Creating %d shaders\n", num_iters);
ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
util_draw_arrays(ctx, PIPE_PRIM_POINTS, 0, 1);
- ctx->flush(ctx, NULL);
+ ctx->flush(ctx, NULL, 0);
ctx->bind_fs_state(ctx, NULL);
ctx->delete_fs_state(ctx, fs);
}
- screen->flush_frontbuffer(screen, tex, 0, 0, window);
+ screen->flush_frontbuffer(screen, tex, 0, 0, window, NULL);
ctx->destroy(ctx);
exit(0);
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;
}
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;
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 = 1;
handle = ctx->create_rasterizer_state(ctx, &rasterizer);
ctx->bind_rasterizer_state(ctx, handle);
}