LibGfx: Add support for DDS images

cubiclove · May 18, 2021 · 24c5b0e · 24c5b0e
1 parent 9f42ccd
commit 24c5b0e
Show file tree

Hide file tree

Showing 18 changed files with 1,375 additions and 11 deletions.
diff --git a/AK/Debug.h.in b/AK/Debug.h.in
@@ -66,6 +66,10 @@
 #cmakedefine01 CURSOR_TOOL_DEBUG
 #endif
 
+#ifndef DDS_DEBUG
+#cmakedefine01 DDS_DEBUG
+#endif
+
 #ifndef DEFERRED_INVOKE_DEBUG
 #cmakedefine01 DEFERRED_INVOKE_DEBUG
 #endif

diff --git a/Base/home/anon/.config/LaunchServer.ini b/Base/home/anon/.config/LaunchServer.ini
@@ -1,4 +1,5 @@
 [FileType]
+dds=/bin/ImageViewer
 pbm=/bin/ImageViewer
 pgm=/bin/ImageViewer
 png=/bin/ImageViewer

diff --git a/Base/res/apps/ImageViewer.af b/Base/res/apps/ImageViewer.af
@@ -4,4 +4,4 @@ Executable=/bin/ImageViewer
 Category=Graphics
 
 [Launcher]
-FileTypes=pbm,pgm,png,ppm,gif,jpg,jpeg
+FileTypes=pbm,pgm,png,ppm,gif,jpg,jpeg,dds
diff --git a/Base/res/html/misc/ddssuite.html b/Base/res/html/misc/ddssuite.html
@@ -0,0 +1,35 @@
+<html>
+ <head><title>DDS test suite</title></head>
+ <body>
+ <table border="1" width="100%">
+ <tr>
+ <th>Type</th>
+ <th>Image</th>
+ </tr>
+ <tr>
+ <td align="center">DXT1</td>
+ <td align="center"><img src="ddssuite_files/DXT1.dds"></td>
+ </tr>
+ <tr>
+ <td align="center">DXT3</td>
+ <td align="center"><img src="ddssuite_files/DXT3.dds"></td>
+ </tr>
+ <tr>
+ <td align="center">DXT5</td>
+ <td align="center"><img src="ddssuite_files/DXT5.dds"></td>
+ </tr>
+ <tr>
+ <td align="center">DXT3 - alpha</td>
+ <td align="center"><img src="ddssuite_files/DXT3-alpha.dds"></td>
+ </tr>
+ <tr>
+ <td align="center">DXT5 - alpha</td>
+ <td align="center"><img src="ddssuite_files/DXT5-alpha.dds"></td>
+ </tr>
+ <tr>
+ <td align="center">DXT1 - mipmap</td>
+ <td align="center"><img src="ddssuite_files/DXT1-mipmap.dds"></td>
+ </tr>
+ </table>
+ </body>
+</html>
diff --git a/Base/res/html/misc/ddssuite_files/DXT1-mipmap.dds b/Base/res/html/misc/ddssuite_files/DXT1-mipmap.dds
diff --git a/Base/res/html/misc/ddssuite_files/DXT1.dds b/Base/res/html/misc/ddssuite_files/DXT1.dds
diff --git a/Base/res/html/misc/ddssuite_files/DXT3-alpha.dds b/Base/res/html/misc/ddssuite_files/DXT3-alpha.dds
diff --git a/Base/res/html/misc/ddssuite_files/DXT3.dds b/Base/res/html/misc/ddssuite_files/DXT3.dds
diff --git a/Base/res/html/misc/ddssuite_files/DXT5-alpha.dds b/Base/res/html/misc/ddssuite_files/DXT5-alpha.dds
diff --git a/Base/res/html/misc/ddssuite_files/DXT5.dds b/Base/res/html/misc/ddssuite_files/DXT5.dds
diff --git a/Base/res/html/misc/welcome.html b/Base/res/html/misc/welcome.html
@@ -38,6 +38,7 @@ <h1>Welcome to the Serenity Browser!</h1>
  <p>This page loaded in <b><span id="loadtime"></span></b> ms</p>
  <p>Some small test pages:</p>
  <ul>
+ <li><a href="ddssuite.html">DDS test suite</a></li>
  <li><a href="websocket.html">WebSocket API Test</a></li>
  <li><a href="cookie.html">document.cookie</a></li>
  <li><a href="last-of-type.html">CSS :last-of-type selector</a></li>

diff --git a/Meta/CMake/all_the_debug_macros.cmake b/Meta/CMake/all_the_debug_macros.cmake
@@ -182,6 +182,7 @@ set(WASM_BINPARSER_DEBUG ON)
 set(WASM_TRACE_DEBUG ON)
 set(PDF_DEBUG ON)
 set(SOLITAIRE_DEBUG ON)
+set(DDS_DEBUG ON)
 
 # False positive: DEBUG is a flag but it works differently.
 # set(DEBUG ON)

diff --git a/Userland/Libraries/LibGfx/Bitmap.cpp b/Userland/Libraries/LibGfx/Bitmap.cpp
@@ -13,6 +13,7 @@
 #include <AK/String.h>
 #include <LibGfx/BMPLoader.h>
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/DDSLoader.h>
 #include <LibGfx/GIFLoader.h>
 #include <LibGfx/ICOLoader.h>
 #include <LibGfx/JPGLoader.h>

diff --git a/Userland/Libraries/LibGfx/Bitmap.h b/Userland/Libraries/LibGfx/Bitmap.h
@@ -13,16 +13,17 @@
 #include <LibGfx/Forward.h>
 #include <LibGfx/Rect.h>
 
-#define ENUMERATE_IMAGE_FORMATS \
- __ENUMERATE_IMAGE_FORMAT(pbm, ".pbm") \
- __ENUMERATE_IMAGE_FORMAT(pgm, ".pgm") \
- __ENUMERATE_IMAGE_FORMAT(png, ".png") \
- __ENUMERATE_IMAGE_FORMAT(ppm, ".ppm") \
- __ENUMERATE_IMAGE_FORMAT(gif, ".gif") \
- __ENUMERATE_IMAGE_FORMAT(bmp, ".bmp") \
- __ENUMERATE_IMAGE_FORMAT(ico, ".ico") \
- __ENUMERATE_IMAGE_FORMAT(jpg, ".jpg") \
- __ENUMERATE_IMAGE_FORMAT(jpg, ".jpeg")
+#define ENUMERATE_IMAGE_FORMATS \
+ __ENUMERATE_IMAGE_FORMAT(pbm, ".pbm") \
+ __ENUMERATE_IMAGE_FORMAT(pgm, ".pgm") \
+ __ENUMERATE_IMAGE_FORMAT(png, ".png") \
+ __ENUMERATE_IMAGE_FORMAT(ppm, ".ppm") \
+ __ENUMERATE_IMAGE_FORMAT(gif, ".gif") \
+ __ENUMERATE_IMAGE_FORMAT(bmp, ".bmp") \
+ __ENUMERATE_IMAGE_FORMAT(ico, ".ico") \
+ __ENUMERATE_IMAGE_FORMAT(jpg, ".jpg") \
+ __ENUMERATE_IMAGE_FORMAT(jpg, ".jpeg") \
+ __ENUMERATE_IMAGE_FORMAT(dds, ".dds")
 
 namespace Gfx {
 

diff --git a/Userland/Libraries/LibGfx/CMakeLists.txt b/Userland/Libraries/LibGfx/CMakeLists.txt
@@ -8,6 +8,7 @@ set(SOURCES
  ClassicStylePainter.cpp
  ClassicWindowTheme.cpp
  Color.cpp
+ DDSLoader.cpp
  DisjointRectSet.cpp
  Emoji.cpp
  FontDatabase.cpp