diff options
| author | Keith Whitwell <[email protected]> | 2010-03-16 09:02:38 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-03-16 09:02:38 +0000 |
| commit | 8cdfd1219a2d13d252a8691ee6dddb0d773bdc77 (patch) | |
| tree | 087318efba7eb0fb5e1c1d8422eca611abdee3e7 /progs/objviewer | |
| parent | 6420aca08ba6910dce22ab9f813cc57d611b0aa8 (diff) | |
| parent | e0ce4a4a0994211ead8e5a77cccdd2a084e8a288 (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix.
Conflicts:
src/gallium/drivers/nv50/nv50_tex.c
Diffstat (limited to 'progs/objviewer')
| -rw-r--r-- | progs/objviewer/skybox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/objviewer/skybox.c b/progs/objviewer/skybox.c index 4e30742e208..93331b9c168 100644 --- a/progs/objviewer/skybox.c +++ b/progs/objviewer/skybox.c @@ -88,9 +88,9 @@ LoadSkyBoxCubeTexture(const char *filePosX, return 0; if (!load(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, fileNegX, GL_TRUE, GL_TRUE)) return 0; - if (!load(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, filePosY, 1+GL_FALSE, GL_TRUE)) + if (!load(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, filePosY, GL_TRUE, GL_TRUE)) return 0; - if (!load(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, fileNegY, 1+GL_FALSE, GL_TRUE)) + if (!load(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, fileNegY, GL_TRUE, GL_TRUE)) return 0; if (!load(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, filePosZ, GL_TRUE, GL_TRUE)) return 0; |