diff options
| author | Marek Olšák <[email protected]> | 2012-05-11 16:38:13 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-05-11 16:38:13 +0200 |
| commit | bb4c5d72d7c7cb1d9e7016e2c07c36875f30011a (patch) | |
| tree | 153444ff535900f82ae63b5af8ccd09fb2f063af /src/gallium/tests | |
| parent | 96956dc5076fc03b9290368ca90e3f3b870ee613 (diff) | |
| parent | 8dd3e341b337ca2d22bcc0e7548a78a6c36ca77d (diff) | |
Merge branch 'gallium-userbuf'
Conflicts:
src/gallium/docs/source/screen.rst
src/gallium/drivers/nv50/nv50_state.c
src/gallium/include/pipe/p_defines.h
src/mesa/state_tracker/st_draw.c
Diffstat (limited to 'src/gallium/tests')
| -rw-r--r-- | src/gallium/tests/graw/fs-test.c | 4 | ||||
| -rw-r--r-- | src/gallium/tests/graw/gs-test.c | 4 | ||||
| -rw-r--r-- | src/gallium/tests/graw/vs-test.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c index f8b2a0a77a0..b42a86cfc8e 100644 --- a/src/gallium/tests/graw/fs-test.c +++ b/src/gallium/tests/graw/fs-test.c @@ -148,7 +148,7 @@ static void init_fs_constbuf( void ) sizeof constants1); - ctx->set_constant_buffer(ctx, + pipe_set_constant_buffer(ctx, PIPE_SHADER_FRAGMENT, 0, constbuf1); } @@ -165,7 +165,7 @@ static void init_fs_constbuf( void ) sizeof constants2); - ctx->set_constant_buffer(ctx, + pipe_set_constant_buffer(ctx, PIPE_SHADER_FRAGMENT, 1, constbuf2); } diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c index ef2440291fc..a471abd9a3d 100644 --- a/src/gallium/tests/graw/gs-test.c +++ b/src/gallium/tests/graw/gs-test.c @@ -181,7 +181,7 @@ static void init_fs_constbuf( void ) sizeof constants1); - ctx->set_constant_buffer(ctx, + pipe_set_constant_buffer(ctx, PIPE_SHADER_GEOMETRY, 0, constbuf1); } @@ -198,7 +198,7 @@ static void init_fs_constbuf( void ) sizeof constants2); - ctx->set_constant_buffer(ctx, + pipe_set_constant_buffer(ctx, PIPE_SHADER_GEOMETRY, 1, constbuf2); } diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c index 83d86fbf5b2..23b7ada98ad 100644 --- a/src/gallium/tests/graw/vs-test.c +++ b/src/gallium/tests/graw/vs-test.c @@ -110,7 +110,7 @@ static void init_fs_constbuf( void ) sizeof constants); - ctx->set_constant_buffer(ctx, + pipe_set_constant_buffer(ctx, PIPE_SHADER_FRAGMENT, 0, constbuf); } |