diff options
| author | Ray <raysan5@gmail.com> | 2017-05-10 19:37:48 +0200 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2017-05-10 19:37:48 +0200 |
| commit | 93e2fd8ea1b62cedb74f5d30c005676ae78cc004 (patch) | |
| tree | 7ff7288b6935a00ca2447e1d2bbc32ce4e32da91 /src | |
| parent | 16842233c92cec78bb3771c711269b43be33c241 (diff) | |
| download | raylib-93e2fd8ea1b62cedb74f5d30c005676ae78cc004.tar.gz raylib-93e2fd8ea1b62cedb74f5d30c005676ae78cc004.zip | |
Some tweaks
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 4 | ||||
| -rw-r--r-- | src/rlgl.c | 3 | ||||
| -rw-r--r-- | src/textures.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index f2e09988..bf19018b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -325,12 +325,12 @@ else endif ifeq ($(PLATFORM),PLATFORM_ANDROID) $(CC) -shared -o $(OUTPUT_PATH)/libraylib.so $(OBJS) - @echo "raylib shared library (libraylib.so) generated!" + @echo "raylib shared library generated (libraylib.so)!" endif else # compile raylib static library. $(AR) rcs $(OUTPUT_PATH)/libraylib.a $(OBJS) - @echo "libraylib.a generated (static library)!" + @echo "raylib static library generated (libraylib.a)!" ifeq ($(SHARED_OPENAL),NO) @echo "expected OpenAL Soft static library linking" else @@ -1052,6 +1052,7 @@ void rlglInit(int width, int height) // NOTE: On OpenGL 3.3 VAO and NPOT are supported by default vaoSupported = true; texNPOTSupported = true; + texFloatSupported = true; // We get a list of available extensions and we check for some of them (compressed textures) // NOTE: We don't need to check again supported extensions but we do (GLAD already dealt with that) @@ -1425,7 +1426,7 @@ unsigned int rlglLoadTexture(void *data, int width, int height, int format, int case UNCOMPRESSED_R5G5B5A1: glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB5_A1, width, height, 0, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, (unsigned short *)data); break; case UNCOMPRESSED_R4G4B4A4: glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA4, width, height, 0, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, (unsigned short *)data); break; case UNCOMPRESSED_R8G8B8A8: glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (unsigned char *)data); break; - case UNCOMPRESSED_R32G32B32: glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, width, height, 0, GL_RGB, GL_FLOAT, (float *)data); break; + case UNCOMPRESSED_R32G32B32: if (texFloatSupported) glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, width, height, 0, GL_RGB, GL_FLOAT, (float *)data); break; case COMPRESSED_DXT1_RGB: if (texCompDXTSupported) LoadCompressedTexture((unsigned char *)data, width, height, mipmapCount, GL_COMPRESSED_RGB_S3TC_DXT1_EXT); break; case COMPRESSED_DXT1_RGBA: if (texCompDXTSupported) LoadCompressedTexture((unsigned char *)data, width, height, mipmapCount, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT); break; case COMPRESSED_DXT3_RGBA: if (texCompDXTSupported) LoadCompressedTexture((unsigned char *)data, width, height, mipmapCount, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT); break; diff --git a/src/textures.c b/src/textures.c index f1b979d7..81d36ef8 100644 --- a/src/textures.c +++ b/src/textures.c @@ -385,7 +385,7 @@ Texture2D LoadTextureFromImage(Image image) texture.mipmaps = image.mipmaps; texture.format = image.format; - TraceLog(INFO, "[TEX %i] Parameters: %ix%i, %i mips, format %i", texture.id, texture.width, texture.height, texture.mipmaps, texture.format); + TraceLog(DEBUG, "[TEX ID %i] Parameters: %ix%i, %i mips, format %i", texture.id, texture.width, texture.height, texture.mipmaps, texture.format); return texture; } |