Skip to content

Commit

Permalink
3rd party: Update GLI to version 0.7.0.0.
Browse files Browse the repository at this point in the history 
Also change the URL to the upstream repo.
  • Loading branch information
@CrossVR
CrossVR committed Nov 15, 2015
1 parent 7493dd9 commit 9704a21
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
url = https://github.com/Armada651/glew
[submodule "cs/3rd party/gli"]
path = cs/3rd party/gli
url = https://github.com/Armada651/gli.git
url = https://github.com/g-truc/gli.git
2 changes: 1 addition & 1 deletion cs/3rd party/gli
Submodule gli updated 1206 files
2 changes: 2 additions & 0 deletions cs/engine/layers/xrRender/r_constants.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,10 @@ void R_constant_table::merge(R_constant_table* T)
R_constant_load& dL = (src->destination&4)?C->samp:((src->destination&1)?C->ps:C->vs);
dL.index = sL.index;
dL.cls = sL.cls;
#ifdef USE_OGL
dL.location = sL.location;
dL.program = sL.program;
#endif // USE_OGL
}
}

Expand Down
45 changes: 20 additions & 25 deletions cs/engine/layers/xrRenderPC_GL/glTexture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,38 +111,35 @@ GLuint CRender::texture_load(LPCSTR fRName, u32& ret_msize, GLenum& ret_desc)
#endif // DEBUG
img_size = S->length();
R_ASSERT(S);
gli::storage IMG = gli::load_dds((char*)S->pointer(), img_size);
if (IMG.faces() > 1) goto _DDS_CUBE;
gli::texture Texture = gli::load((char*)S->pointer(), img_size);
R_ASSERT(!Texture.empty());
if (gli::is_target_cube(Texture.target())) goto _DDS_CUBE;
else goto _DDS_2D;

_DDS_CUBE:
{
gli::textureCube TextureCube(IMG);
R_ASSERT(!TextureCube.empty());
gli::gl GL;
mip_cnt = Texture.levels();
dwWidth = Texture.dimensions().x;
dwHeight = Texture.dimensions().y;
fmt = GL.translate(Texture.format());

glGenTextures(1, &pTexture);
glBindTexture(GL_TEXTURE_CUBE_MAP, pTexture);
CHK_GL(glTexStorage2D(GL_TEXTURE_CUBE_MAP, mip_cnt, fmt.Internal, dwWidth, dwHeight));

for (size_t face = 0; face < TextureCube.faces(); face++)
for (size_t face = 0; face < Texture.faces(); face++)
{
gli::texture2D Texture(TextureCube[face]);
R_ASSERT(!Texture.empty());
mip_cnt = Texture.levels();
dwWidth = Texture.dimensions().x;
dwHeight = Texture.dimensions().y;
fmt = GL.translate(Texture.format());

glGenTextures(1, &pTexture);
glBindTexture(GL_TEXTURE_CUBE_MAP, pTexture);
CHK_GL(glTexStorage2D(GL_TEXTURE_CUBE_MAP, mip_cnt, fmt.Internal, dwWidth, dwHeight));
for (size_t i = 0; i < mip_cnt; i++)
{
if (gli::is_compressed(Texture.format()))
{
CHK_GL(glCompressedTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, i, 0, 0, Texture[i].dimensions().x, Texture[i].dimensions().y,
fmt.External, Texture[i].size(), Texture[i].data()));
CHK_GL(glCompressedTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, i, 0, 0, Texture.dimensions(i).x, Texture.dimensions(i).y,
fmt.Internal, Texture.size(i), Texture.data(0, face, i)));
}
else {
CHK_GL(glTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, i, 0, 0, Texture[i].dimensions().x, Texture[i].dimensions().y,
fmt.External, fmt.Type, Texture[i].data()));
CHK_GL(glTexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, i, 0, 0, Texture.dimensions(i).x, Texture.dimensions(i).y,
fmt.External, fmt.Type, Texture.data(0, face, i)));
}
}
}
Expand All @@ -160,8 +157,6 @@ GLuint CRender::texture_load(LPCSTR fRName, u32& ret_msize, GLenum& ret_desc)


// Load SYS-MEM-surface, bound to device restrictions
gli::texture2D Texture(IMG);
R_ASSERT(!Texture.empty());
gli::gl GL;
mip_cnt = Texture.levels();
dwWidth = Texture.dimensions().x;
Expand All @@ -175,12 +170,12 @@ GLuint CRender::texture_load(LPCSTR fRName, u32& ret_msize, GLenum& ret_desc)
{
if (gli::is_compressed(Texture.format()))
{
CHK_GL(glCompressedTexSubImage2D(GL_TEXTURE_2D, i, 0, 0, Texture[i].dimensions().x, Texture[i].dimensions().y,
fmt.External, Texture[i].size(), Texture[i].data()));
CHK_GL(glCompressedTexSubImage2D(GL_TEXTURE_2D, i, 0, 0, Texture.dimensions(i).x, Texture.dimensions(i).y,
fmt.Internal, Texture.size(i), Texture.data(0, 0, i)));
}
else {
CHK_GL(glTexSubImage2D(GL_TEXTURE_2D, i, 0, 0, Texture[i].dimensions().x, Texture[i].dimensions().y,
fmt.External, fmt.Type, Texture[i].data()));
CHK_GL(glTexSubImage2D(GL_TEXTURE_2D, i, 0, 0, Texture.dimensions(i).x, Texture.dimensions(i).y,
fmt.External, fmt.Type, Texture.data(0, 0, i)));
}
}
FS.r_close(S);
Expand Down
6 changes: 3 additions & 3 deletions cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<AdditionalIncludeDirectories>.\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)3rd party;$(SolutionDir)3rd party\glew\include;$(SolutionDir)3rd party\gli;$(SolutionDir)3rd party\gli\external\glm;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)3rd party;$(SolutionDir)3rd party\glew\include;$(SolutionDir)3rd party\gli;$(SolutionDir)3rd party\gli\external\glm-0.9.7.1;$(AdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_OGL;NO_XR_VDECLARATOR;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_GL_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
Expand Down Expand Up @@ -118,7 +118,7 @@
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>.\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)3rd party;$(SolutionDir)3rd party\glew\include;$(SolutionDir)3rd party\gli;$(SolutionDir)3rd party\gli\external\glm;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)3rd party;$(SolutionDir)3rd party\glew\include;$(SolutionDir)3rd party\gli;$(SolutionDir)3rd party\gli\external\glm-0.9.7.1;$(AdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_OGL;NO_XR_VDECLARATOR;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRRENDER_GL_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling />
Expand Down Expand Up @@ -164,7 +164,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<AdditionalIncludeDirectories>.\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)3rd party;$(SolutionDir)3rd party\glew\include;$(SolutionDir)3rd party\gli;$(SolutionDir)3rd party\gli\external\glm;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;$(SolutionDir)engine;$(SolutionDir)sdk\include;$(SolutionDir)3rd party;$(SolutionDir)3rd party\glew\include;$(SolutionDir)3rd party\gli;$(SolutionDir)3rd party\gli\external\glm-0.9.7.1;$(AdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_OGL;NO_XR_VDECLARATOR;MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_GL_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Expand Down

0 comments on commit 9704a21

Please sign in to comment.