diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-14 22:31:04 +0000 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-14 22:31:04 +0000 |
| commit | b01ffb12ed82dcf435b186e2aff35e344a8a6ebe (patch) | |
| tree | a62ee3f8f402f0c34ac88b5011da41a9cab8c6e3 /progs/tests/texwrap.c | |
| parent | ffd28480560caecfb676a4bbe85a85672271e3f7 (diff) | |
| parent | 252812bf15c3479d921157b9a432c7e42d3b9446 (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/util/Makefile
src/gallium/drivers/r300/r300_state_derived.c
Diffstat (limited to 'progs/tests/texwrap.c')
| -rw-r--r-- | progs/tests/texwrap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/tests/texwrap.c b/progs/tests/texwrap.c index 92c8a2f14c..39c55919dd 100644 --- a/progs/tests/texwrap.c +++ b/progs/tests/texwrap.c @@ -71,7 +71,7 @@ static struct wrap_mode modes[] = { WRAP_EXT ( GL_MIRROR_CLAMP_TO_EDGE_EXT, "GL_ATI_texture_mirror_once", "GL_EXT_texture_mirror_clamp", 999.0 ), - { 0 } + { 0, NULL, GL_FALSE, 0.0, { NULL, NULL } } }; static void |