projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallium: add pipe cap for scissored clears and pass scissor state to clear() hook
[mesa.git]
/
src
/
gallium
/
tests
/
graw
/
fs-test.c
diff --git
a/src/gallium/tests/graw/fs-test.c
b/src/gallium/tests/graw/fs-test.c
index 51be87478f771039fe550242cab1e2a61d3467b9..346bbedd61a39d33b48a5ae75b4daaae35d5eb39 100644
(file)
--- a/
src/gallium/tests/graw/fs-test.c
+++ b/
src/gallium/tests/graw/fs-test.c
@@
-31,8
+31,8
@@
static void usage(char *name)
enum pipe_format formats[] = {
enum pipe_format formats[] = {
- PIPE_FORMAT_R
8G8B8A
8_UNORM,
- PIPE_FORMAT_B
8G8R8A
8_UNORM,
+ PIPE_FORMAT_R
GBA888
8_UNORM,
+ PIPE_FORMAT_B
GRA888
8_UNORM,
PIPE_FORMAT_NONE
};
PIPE_FORMAT_NONE
};
@@
-132,25
+132,23
@@
static void init_fs_constbuf( void )
static void set_viewport( float x, float y,
float width, float height,
static void set_viewport( float x, float y,
float width, float height,
- float
near, float f
ar)
+ float
zNear, float zF
ar)
{
{
- float z =
f
ar;
+ float z =
zF
ar;
float half_width = (float)width / 2.0f;
float half_height = (float)height / 2.0f;
float half_width = (float)width / 2.0f;
float half_height = (float)height / 2.0f;
- float half_depth = ((float)
far - (float)n
ear) / 2.0f;
+ float half_depth = ((float)
zFar - (float)zN
ear) / 2.0f;
struct pipe_viewport_state vp;
vp.scale[0] = half_width;
vp.scale[1] = half_height;
vp.scale[2] = half_depth;
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[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_state
s( ctx, 0, 1
, &vp );
}
static void set_vertices( void )
}
static void set_vertices( void )
@@
-175,13
+173,13
@@
static void set_vertices( void )
vbuf.stride = sizeof( struct vertex );
vbuf.buffer_offset = 0;
vbuf.stride = sizeof( struct vertex );
vbuf.buffer_offset = 0;
- vbuf.buffer = pipe_buffer_create_with_data(ctx,
+ vbuf.buffer
.resource
= pipe_buffer_create_with_data(ctx,
PIPE_BIND_VERTEX_BUFFER,
PIPE_BIND_VERTEX_BUFFER,
- PIPE_USAGE_
STATIC
,
+ PIPE_USAGE_
DEFAULT
,
sizeof(vertices),
vertices);
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 set_vertex_shader( void )
@@
-234,13
+232,13
@@
static void draw( void )
{
union pipe_color_union clear_color = { {.1,.3,.5,0} };
{
union pipe_color_union clear_color = { {.1,.3,.5,0} };
- ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
+ ctx->clear(ctx, PIPE_CLEAR_COLOR,
NULL,
&clear_color, 0, 0);
util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
- ctx->flush(ctx, NULL);
+ ctx->flush(ctx, NULL
, 0
);
graw_save_surface_to_file(ctx, surf, NULL);
graw_save_surface_to_file(ctx, surf, NULL);
- screen->flush_frontbuffer(screen, rttex, 0, 0, window);
+ screen->flush_frontbuffer(screen, rttex, 0, 0, window
, NULL
);
}
#define SIZE 16
}
#define SIZE 16
@@
-295,6
+293,7
@@
static void init_tex( void )
tex2d[1][1][3] = 255;
#endif
tex2d[1][1][3] = 255;
#endif
+ memset(&templat, 0, sizeof(templat));
templat.target = PIPE_TEXTURE_2D;
templat.format = PIPE_FORMAT_B8G8R8A8_UNORM;
templat.width0 = SIZE;
templat.target = PIPE_TEXTURE_2D;
templat.format = PIPE_FORMAT_B8G8R8A8_UNORM;
templat.width0 = SIZE;
@@
-302,7
+301,6
@@
static void init_tex( void )
templat.depth0 = 1;
templat.array_size = 1;
templat.last_level = 0;
templat.depth0 = 1;
templat.array_size = 1;
templat.last_level = 0;
- templat.nr_samples = 1;
templat.bind = PIPE_BIND_SAMPLER_VIEW;
templat.bind = PIPE_BIND_SAMPLER_VIEW;
@@
-313,14
+311,14
@@
static void init_tex( void )
u_box_2d(0,0,SIZE,SIZE, &box);
u_box_2d(0,0,SIZE,SIZE, &box);
- ctx->t
ransfer_inline_write
(ctx,
-
samptex,
-
0,
-
PIPE_TRANSFER_WRITE,
-
&box,
-
tex2d,
-
sizeof tex2d[0],
-
sizeof tex2d);
+ ctx->t
exture_subdata
(ctx,
+ samptex,
+ 0,
+ PIPE_TRANSFER_WRITE,
+ &box,
+ tex2d,
+ sizeof tex2d[0],
+ sizeof tex2d);
/* Possibly read back & compare against original data:
*/
/* Possibly read back & compare against original data:
*/
@@
-352,7
+350,7
@@
static void init_tex( void )
if (sv == NULL)
exit(5);
if (sv == NULL)
exit(5);
- ctx->set_
fragment_sampler_views(ctx
, 1, &sv);
+ ctx->set_
sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0
, 1, &sv);
memset(&sampler_desc, 0, sizeof sampler_desc);
memset(&sampler_desc, 0, sizeof sampler_desc);
@@
-371,7
+369,7
@@
static void init_tex( void )
if (sampler == NULL)
exit(6);
if (sampler == NULL)
exit(6);
- ctx->bind_
fragment_sampler_states(ctx
, 1, &sampler);
+ ctx->bind_
sampler_states(ctx, PIPE_SHADER_FRAGMENT, 0
, 1, &sampler);
}
}
@@
-400,10
+398,11
@@
static void init( void )
exit(1);
}
exit(1);
}
- ctx = screen->context_create(screen, NULL);
+ ctx = screen->context_create(screen, NULL
, 0
);
if (ctx == NULL)
exit(3);
if (ctx == NULL)
exit(3);
+ memset(&templat, 0, sizeof(templat));
templat.target = PIPE_TEXTURE_2D;
templat.format = formats[i];
templat.width0 = WIDTH;
templat.target = PIPE_TEXTURE_2D;
templat.format = formats[i];
templat.width0 = WIDTH;
@@
-411,7
+410,6
@@
static void init( void )
templat.depth0 = 1;
templat.array_size = 1;
templat.last_level = 0;
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);
templat.bind = (PIPE_BIND_RENDER_TARGET |
PIPE_BIND_DISPLAY_TARGET);
@@
-421,7
+419,6
@@
static void init( void )
exit(4);
surf_tmpl.format = templat.format;
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_tmpl.u.tex.level = 0;
surf_tmpl.u.tex.first_layer = 0;
surf_tmpl.u.tex.last_layer = 0;
@@
-459,8
+456,10
@@
static void init( void )
void *handle;
memset(&rasterizer, 0, sizeof rasterizer);
rasterizer.cull_face = PIPE_FACE_NONE;
void *handle;
memset(&rasterizer, 0, sizeof rasterizer);
rasterizer.cull_face = PIPE_FACE_NONE;
- rasterizer.gl_rasterization_rules = 1;
- rasterizer.depth_clip = 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);
}
handle = ctx->create_rasterizer_state(ctx, &rasterizer);
ctx->bind_rasterizer_state(ctx, handle);
}