Skip to content

Fix build errors #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lixit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build errors #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ build/*
!build/templates
bin/*
!bin/media/
*.lib
lib
CMakeFiles
2 changes: 2 additions & 0 deletions include/vgl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <GL3/gl3w.h>

#include <GLFW/glfw3.h>
#include <sys/time.h>
#include <string.h>

#define BUFFER_OFFSET(a) ((void*)(a))

Expand Down
9 changes: 6 additions & 3 deletions lib/vdds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,8 @@ void vglLoadDDS(const char* filename, vglImageData* image)

if (file_header.magic != DDS_MAGIC)
{
goto done_close_file;
fclose(f);
return;
}

if (file_header.std_header.ddspf.dwFourCC == DDS_FOURCC_DX10)
Expand All @@ -596,12 +597,14 @@ void vglLoadDDS(const char* filename, vglImageData* image)
}

if (!vgl_DDSHeaderToImageDataHeader(file_header, image))
goto done_close_file;
fclose(f);
return;

image->target = vgl_GetTargetFromDDSHeader(file_header);

if (image->target == GL_NONE)
goto done_close_file;
fclose(f);
return;

size_t current_pos = ftell(f);
size_t file_size;
Expand Down
2 changes: 1 addition & 1 deletion src/12-particlesimulator/12-particlesimulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void ComputeParticleSimulator::Initialize(const char * title)

static const char compute_shader_source[] =
STRINGIZE(
#version 430 core\n
version 430 core\n

layout (std140, binding = 0) uniform attractor_block
{
Expand Down