Skip to content
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

Jump to bottom

Move third-party includes into a subfolder #456

Merged
merged 2 commits into from
Mar 1, 2024
Merged

Move third-party includes into a subfolder #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9263da7
Move STB & TinyEXR headers out of main source directory (#455)
jherico Mar 1, 2024
de58f4e
Update directory
solidpixel Mar 1, 2024
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
0 Source/stb_image.h → Source/ThirdParty/stb_image.h
View file
Open in desktop
File renamed without changes.
0 Source/stb_image_write.h → Source/ThirdParty/stb_image_write.h
View file
Open in desktop
File renamed without changes.
0 Source/tinyexr.h → Source/ThirdParty/tinyexr.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions Source/astcenccli_image_external.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ static void astcenc_runtime_assert(bool condition)
}
}

#include "stb_image.h"
#include "stb_image_write.h"
#include "tinyexr.h"
#include "ThirdParty/stb_image.h"
#include "ThirdParty/stb_image_write.h"
#include "ThirdParty/tinyexr.h"

/**
* @brief Load an image using Wuffs to provide the loader.
Expand Down
6 changes: 3 additions & 3 deletions Source/astcenccli_image_load_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

#include "astcenccli_internal.h"

#include "stb_image.h"
#include "stb_image_write.h"
#include "tinyexr.h"
#include "ThirdParty/stb_image.h"
#include "ThirdParty/stb_image_write.h"
#include "ThirdParty/tinyexr.h"

/**
* @brief Determine the output file name to use for a sliced image write.
Expand Down
4 changes: 2 additions & 2 deletions Utils/Example/astc_api_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "astcenc.h"

#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h"
#include "ThirdParty/stb_image.h"

#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image_write.h"
#include "ThirdParty/stb_image_write.h"

int main(int argc, char **argv)
{
Expand Down
20 changes: 10 additions & 10 deletions Utils/astc_blend_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
#include "astcenc_mathlib.h"

#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h"
#include "ThirdParty/stb_image.h"

#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image_write.h"
#include "ThirdParty/stb_image_write.h"

/**
* @brief Linearize an sRGB value.
Expand Down Expand Up @@ -165,10 +165,10 @@ int main(int argc, char **argv)
float g_dst = 1.0f;
float b_dst = 0.8f;

float r_out;
float g_out;
float b_out;
float a_out;
float r_out;
float g_out;
float b_out;
float a_out;

// Post-multiply blending
if (use_post_blend)
Expand Down Expand Up @@ -241,10 +241,10 @@ int main(int argc, char **argv)
float g_dst = 1.0f;
float b_dst = 0.8f;

float r_out;
float g_out;
float b_out;
float a_out;
float r_out;
float g_out;
float b_out;
float a_out;

// Post-multiply blending
if (use_post_blend)
Expand Down
4 changes: 2 additions & 2 deletions Utils/astc_rgbm_codec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
#include "astcenc_mathlib.h"

#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h"
#include "ThirdParty/stb_image.h"

#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image_write.h"
#include "ThirdParty/stb_image_write.h"

#define MODE_ENCODE 0
#define MODE_DECODE 1
Expand Down
4 changes: 2 additions & 2 deletions Utils/astc_test_autoextract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
#include <stdlib.h>

#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h"
#include "ThirdParty/stb_image.h"

#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image_write.h"
#include "ThirdParty/stb_image_write.h"

/**
* @brief Compute the array offset in a 2D image
Expand Down
4 changes: 2 additions & 2 deletions Utils/astc_test_autoextract_hdr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
#include <stdlib.h>

#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h"
#include "ThirdParty/stb_image.h"

#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image_write.h"
#include "ThirdParty/stb_image_write.h"

/**
* @brief Compute the array offset in a 2D image
Expand Down