Mesa (master): progs/gallium/raw: Update symbols.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Mon Apr 12 06:32:48 UTC 2010
Module: Mesa
Branch: master
Commit: cd70b6bd9ea8bfc4342f45340a1fedfaed81257f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd70b6bd9ea8bfc4342f45340a1fedfaed81257f
Author: José Fonseca <jfonseca at vmware.com>
Date: Mon Apr 12 15:09:18 2010 +0900
progs/gallium/raw: Update symbols.
Untested -- just the same changes done to progs/gallium/python.
---
progs/gallium/raw/clear.c | 10 +++++-----
progs/gallium/trivial/quad-tex.c | 8 ++++----
progs/gallium/trivial/tri.c | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/progs/gallium/raw/clear.c b/progs/gallium/raw/clear.c
index 5ef5254..706e3be 100644
--- a/progs/gallium/raw/clear.c
+++ b/progs/gallium/raw/clear.c
@@ -56,17 +56,17 @@ int main( int argc, char *argv[] )
templat.depth0 = 1;
templat.last_level = 0;
templat.nr_samples = 1;
- templat.tex_usage = (PIPE_TEXTURE_USAGE_RENDER_TARGET |
- PIPE_TEXTURE_USAGE_DISPLAY_TARGET);
+ templat.bind = (PIPE_BIND_RENDER_TARGET |
+ PIPE_BIND_DISPLAY_TARGET);
- tex = screen->texture_create(screen,
+ tex = screen->resource_create(screen,
&templat);
if (tex == NULL)
exit(4);
surf = screen->get_tex_surface(screen, tex, 0, 0, 0,
- PIPE_TEXTURE_USAGE_RENDER_TARGET |
- PIPE_TEXTURE_USAGE_DISPLAY_TARGET);
+ PIPE_BIND_RENDER_TARGET |
+ PIPE_BIND_DISPLAY_TARGET);
if (surf == NULL)
exit(5);
diff --git a/progs/gallium/trivial/quad-tex.c b/progs/gallium/trivial/quad-tex.c
index 553f558..7ad157c 100644
--- a/progs/gallium/trivial/quad-tex.c
+++ b/progs/gallium/trivial/quad-tex.c
@@ -146,9 +146,9 @@ static void init_prog(struct program *p)
tmplt.height0 = HEIGHT;
tmplt.depth0 = 1;
tmplt.last_level = 0;
- tmplt.tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET;
+ tmplt.bind = PIPE_BIND_RENDER_TARGET;
- p->target = p->screen->texture_create(p->screen, &tmplt);
+ p->target = p->screen->resource_create(p->screen, &tmplt);
}
/* sampler texture */
@@ -165,9 +165,9 @@ static void init_prog(struct program *p)
t_tmplt.height0 = 2;
t_tmplt.depth0 = 1;
t_tmplt.last_level = 0;
- t_tmplt.tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET;
+ t_tmplt.bind = PIPE_BIND_RENDER_TARGET;
- p->tex = p->screen->texture_create(p->screen, &t_tmplt);
+ p->tex = p->screen->resource_create(p->screen, &t_tmplt);
t = p->pipe->get_tex_transfer(p->pipe, p->tex,
0, 0, 0, /* face, level, zslice */
diff --git a/progs/gallium/trivial/tri.c b/progs/gallium/trivial/tri.c
index cae1bdb..6286aef 100644
--- a/progs/gallium/trivial/tri.c
+++ b/progs/gallium/trivial/tri.c
@@ -137,9 +137,9 @@ static void init_prog(struct program *p)
tmplt.height0 = HEIGHT;
tmplt.depth0 = 1;
tmplt.last_level = 0;
- tmplt.tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET;
+ tmplt.bind = PIPE_BIND_RENDER_TARGET;
- p->target = p->screen->texture_create(p->screen, &tmplt);
+ p->target = p->screen->resource_create(p->screen, &tmplt);
}
/* disabled blending/masking */
More information about the mesa-commit
mailing list