diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
| commit | 3ce4375912c8ea488460e593e07c5bb15b92dca9 (patch) | |
| tree | 1011fa439bd829fd46a44fd99478135848800e73 /progs/tests/texwrap.c | |
| parent | f59f28093ea827bd234d8e1a36bdd56a9fce5f09 (diff) | |
| parent | 9b348d0ed125a22be3f318ac60cef6f201edfdab (diff) | |
Merge branch 'master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/util/u_blitter.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_context.h
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/nv50/nv50_context.h
src/gallium/drivers/nv50/nv50_state_validate.c
src/gallium/drivers/nv50/nv50_tex.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/svga/svga_context.h
src/gallium/drivers/svga/svga_pipe_sampler.c
Diffstat (limited to 'progs/tests/texwrap.c')
| -rw-r--r-- | progs/tests/texwrap.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/progs/tests/texwrap.c b/progs/tests/texwrap.c index 39c55919dd..bb26635d67 100644 --- a/progs/tests/texwrap.c +++ b/progs/tests/texwrap.c @@ -31,6 +31,7 @@ #define BORDER_TEXTURE 1 #define NO_BORDER_TEXTURE 2 +#define COLOR_TEX_CORNERS 0 #define SIZE 8 static GLubyte BorderImage[SIZE+2][SIZE+2][4]; @@ -281,6 +282,37 @@ static void Init( void ) for (i = 0; i < SIZE; i++) { for (j = 0; j < SIZE; j++) { +#if COLOR_TEX_CORNERS + if (i == 0 && j == 0) { + /* lower-left texel = RED */ + NoBorderImage[i][j][0] = 255; + NoBorderImage[i][j][1] = 0; + NoBorderImage[i][j][2] = 0; + NoBorderImage[i][j][3] = 255; + } + else if (i == 0 && j == SIZE-1) { + /* lower-right corner = GREEN */ + NoBorderImage[i][j][0] = 0; + NoBorderImage[i][j][1] = 255; + NoBorderImage[i][j][2] = 0; + NoBorderImage[i][j][3] = 255; + } + else if (i == SIZE-1 && j == 0) { + /* upper-left corner = BLUE */ + NoBorderImage[i][j][0] = 0; + NoBorderImage[i][j][1] = 0; + NoBorderImage[i][j][2] = 255; + NoBorderImage[i][j][3] = 255; + } + else if (i == SIZE-1 && j == SIZE-1) { + /* upper-right corner = YELLOW */ + NoBorderImage[i][j][0] = 255; + NoBorderImage[i][j][1] = 255; + NoBorderImage[i][j][2] = 0; + NoBorderImage[i][j][3] = 255; + } + else +#endif if ((i + j) & 1) { /* white */ NoBorderImage[i][j][0] = 255; |