diff --git a/AK/Debug.h.in b/AK/Debug.h.in index 8967cf76cc..d816baa4e9 100644 --- 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 index 9d9d0adc7e..87acdb03ac 100644 --- 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 index d86708d1b2..8d9750c08f 100644 --- 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 new file mode 100644 index 0000000000..f8d50e7947 --- /dev/null +++ b/Base/res/html/misc/ddssuite.html @@ -0,0 +1,35 @@ + + DDS test suite + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TypeImage
DXT1
DXT3
DXT5
DXT3 - alpha
DXT5 - alpha
DXT1 - mipmap
+ + diff --git a/Base/res/html/misc/ddssuite_files/DXT1-mipmap.dds b/Base/res/html/misc/ddssuite_files/DXT1-mipmap.dds new file mode 100644 index 0000000000..581fc44f5d Binary files /dev/null and b/Base/res/html/misc/ddssuite_files/DXT1-mipmap.dds differ diff --git a/Base/res/html/misc/ddssuite_files/DXT1.dds b/Base/res/html/misc/ddssuite_files/DXT1.dds new file mode 100644 index 0000000000..46c5cb57b5 Binary files /dev/null and b/Base/res/html/misc/ddssuite_files/DXT1.dds differ diff --git a/Base/res/html/misc/ddssuite_files/DXT3-alpha.dds b/Base/res/html/misc/ddssuite_files/DXT3-alpha.dds new file mode 100644 index 0000000000..4b1159e77c Binary files /dev/null and b/Base/res/html/misc/ddssuite_files/DXT3-alpha.dds differ diff --git a/Base/res/html/misc/ddssuite_files/DXT3.dds b/Base/res/html/misc/ddssuite_files/DXT3.dds new file mode 100644 index 0000000000..a5003f5417 Binary files /dev/null and b/Base/res/html/misc/ddssuite_files/DXT3.dds differ diff --git a/Base/res/html/misc/ddssuite_files/DXT5-alpha.dds b/Base/res/html/misc/ddssuite_files/DXT5-alpha.dds new file mode 100644 index 0000000000..c5e2be7555 Binary files /dev/null and b/Base/res/html/misc/ddssuite_files/DXT5-alpha.dds differ diff --git a/Base/res/html/misc/ddssuite_files/DXT5.dds b/Base/res/html/misc/ddssuite_files/DXT5.dds new file mode 100644 index 0000000000..14f4bcb387 Binary files /dev/null and b/Base/res/html/misc/ddssuite_files/DXT5.dds differ diff --git a/Base/res/html/misc/welcome.html b/Base/res/html/misc/welcome.html index af2469f9cc..60d3fea30d 100644 --- a/Base/res/html/misc/welcome.html +++ b/Base/res/html/misc/welcome.html @@ -38,6 +38,7 @@ span#loadtime {

This page loaded in ms

Some small test pages: