Fixed segfault in example basic on inter graphics hd and corrected path to model

This commit is contained in:
Eschemann 2020-09-28 15:50:45 +02:00
parent 91da299729
commit 78fe8d9b89
17 changed files with 34 additions and 6 deletions

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ProjectOutputs>C:\Development\RelevantGithubs\tinygltf\examples\basic\basic\Release\basic.exe</ProjectOutputs>
<ContentFiles></ContentFiles>
<SatelliteDlls></SatelliteDlls>
<NonRecipeFileRefs></NonRecipeFileRefs>
</Project>

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,15 @@
 main.cpp
C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": Makro-Neudefinition
C:\Development\RelevantGithubs\tinygltf\examples\basic\basic\packages\nupengl.core.0.1.0.1\build\native\include\GLFW\glfw3.h(92): message : Siehe vorherige Definition von "APIENTRY"
C:\Development\RelevantGithubs\tinygltf\examples\basic\main.cpp(154,38): warning C4018: "<": Konflikt zwischen "signed" und "unsigned"
C:\Development\RelevantGithubs\tinygltf\examples\basic\main.cpp(159,5): warning C4018: "<": Konflikt zwischen "signed" und "unsigned"
C:\Development\RelevantGithubs\tinygltf\examples\basic\main.cpp(171,5): warning C4018: "<": Konflikt zwischen "signed" und "unsigned"
C:\Development\RelevantGithubs\tinygltf\examples\basic\main.cpp(197,38): warning C4018: "<": Konflikt zwischen "signed" und "unsigned"
C:\Development\RelevantGithubs\tinygltf\examples\basic\main.cpp(302,36): warning C4305: "Argument": Verkürzung von "double" in "GLclampf"
shaders.cpp
window.cpp
Code wird generiert.
Previous IPDB not found, fall back to full compilation.
All 3858 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
Codegenerierung ist abgeschlossen.
basic.vcxproj -> C:\Development\RelevantGithubs\tinygltf\examples\basic\basic\Release\basic.exe

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,2 @@
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.27.29110:TargetPlatformVersion=10.0.18362.0:
Release|Win32|C:\Development\RelevantGithubs\tinygltf\examples\basic\basic\|

View File

@ -0,0 +1 @@
C:\Development\RelevantGithubs\tinygltf\examples\basic\basic\Release\basic.exe

Binary file not shown.

View File

@ -22,32 +22,32 @@
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{0589AC44-0CF3-40D8-8D89-68393CFD40F3}</ProjectGuid>
<RootNamespace>basic</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>

View File

@ -329,7 +329,7 @@ static void error_callback(int error, const char *description) {
}
int main(int argc, char **argv) {
std::string filename = "../../models/Cube/Cube.gltf";
std::string filename = "../../../models/Cube/Cube.gltf";
if (argc > 1) {
filename = argv[1];
@ -341,9 +341,12 @@ int main(int argc, char **argv) {
// Force create OpenGL 3.3
// NOTE(syoyo): Linux + NVIDIA driver segfaults for some reason? commenting out glfwWindowHint will work.
// Note (PE): On laptops with intel hd graphics card you can overcome the segfault by enabling experimental, see below (tested on lenovo thinkpad)
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glewExperimental = GL_TRUE;
#ifdef __APPLE__
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
#endif