projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeonsi: don't crash if input_usage_mask is 0 for a VS input
[mesa.git]
/
src
/
gallium
/
tests
/
graw
/
shader-leak.c
diff --git
a/src/gallium/tests/graw/shader-leak.c
b/src/gallium/tests/graw/shader-leak.c
index 57cd2dc2b12ded168bc3a3989eaf900b9f08b626..cc5cd8a4bcd93e4eeae6158016fee0477a5e676a 100644
(file)
--- a/
src/gallium/tests/graw/shader-leak.c
+++ b/
src/gallium/tests/graw/shader-leak.c
@@
-3,7
+3,7
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include "
state_tracker
/graw.h"
+#include "
frontend
/graw.h"
#include "pipe/p_screen.h"
#include "pipe/p_context.h"
#include "pipe/p_state.h"
#include "pipe/p_screen.h"
#include "pipe/p_context.h"
#include "pipe/p_state.h"
@@
-11,14
+11,15
@@
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
#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[] = {
static int num_iters = 100;
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
};
@@
-49,25
+50,23
@@
static struct vertex vertices[1] =
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 )
@@
-86,15
+85,17
@@
static void set_vertices( void )
handle = ctx->create_vertex_elements_state(ctx, 2, ve);
ctx->bind_vertex_elements_state(ctx, handle);
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.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 set_vertex_shader( void )
@@
-147,15
+148,15
@@
static void draw( void )
ctx->bind_fs_state(ctx, fs);
ctx->bind_fs_state(ctx, fs);
- 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_POINTS, 0, 1);
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);
}
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);
ctx->destroy(ctx);
exit(0);
@@
-187,17
+188,17
@@
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.height0 = HEIGHT;
templat.depth0 = 1;
templat.last_level = 0;
templat.target = PIPE_TEXTURE_2D;
templat.format = formats[i];
templat.width0 = WIDTH;
templat.height0 = HEIGHT;
templat.depth0 = 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);
@@
-208,7
+209,6
@@
static void init( void )
}
surf_tmpl.format = templat.format;
}
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;
@@
-248,7
+248,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.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);
}