From 71eb7cdd1418e14e1c03fe8350eb900fe9a41dfa Mon Sep 17 00:00:00 2001 From: Navin Patel Date: Fri, 9 Oct 2020 09:28:12 -0400 Subject: [PATCH] V4.1 alpha build updates and bug fixes --- applications/_libs/cmakelists.txt | 16 +-- applications/_libs/cmp_common/cmakelists.txt | 22 +-- applications/_libs/cmp_fileio/cmakelists.txt | 6 +- applications/_libs/cmp_gui/cmakelists.txt | 18 +-- applications/_libs/cmp_math/cmakelists.txt | 24 ++-- applications/_libs/cmp_math/cmp_math_common.h | 2 +- applications/_libs/cmp_math/jml.h | 8 +- applications/_libs/cmp_math/jmlfuncs.cpp | 6 +- applications/_libs/cmp_math/jmlfuncs.h | 8 +- applications/_libs/cmp_math/jrtcommon.h | 4 +- applications/_libs/cmp_mesh/clustering.cpp | 2 +- applications/_libs/cmp_mesh/cmakelists.txt | 19 ++- applications/_libs/cmp_mesh/error.c | 2 +- applications/_libs/cmp_mesh/feedback.cpp | 2 +- applications/_libs/cmp_mesh/fit.cpp | 2 +- applications/_libs/cmp_mesh/gdiwm.cpp | 2 +- applications/_libs/cmp_mesh/heap.c | 2 +- .../_libs/cmp_mesh/jrt/cmakelists.txt | 50 +++---- .../_libs/cmp_mesh/jrt/jrtboundingbox.cpp | 6 +- .../_libs/cmp_mesh/jrt/jrtboundingbox.h | 2 +- applications/_libs/cmp_mesh/jrt/jrtcamera.cpp | 6 +- applications/_libs/cmp_mesh/jrt/jrtcamera.h | 2 +- applications/_libs/cmp_mesh/jrt/jrtcommon.h | 4 +- applications/_libs/cmp_mesh/jrt/jrtcore.cpp | 18 +-- applications/_libs/cmp_mesh/jrt/jrtcore.h | 4 +- .../_libs/cmp_mesh/jrt/jrtcoreutils.cpp | 8 +- .../_libs/cmp_mesh/jrt/jrth2kdtreebuilder.cpp | 10 +- .../_libs/cmp_mesh/jrt/jrth2kdtreebuilder.h | 4 +- .../jrt/jrtheuristickdtreebuilder.cpp | 14 +- .../cmp_mesh/jrt/jrtheuristickdtreebuilder.h | 6 +- applications/_libs/cmp_mesh/jrt/jrtkdtree.cpp | 8 +- applications/_libs/cmp_mesh/jrt/jrtkdtree.h | 8 +- .../_libs/cmp_mesh/jrt/jrtkdtreebuilder.cpp | 12 +- .../_libs/cmp_mesh/jrt/jrtkdtreebuilder.h | 2 +- applications/_libs/cmp_mesh/jrt/jrtmesh.cpp | 8 +- applications/_libs/cmp_mesh/jrt/jrtmesh.h | 2 +- .../_libs/cmp_mesh/jrt/jrtorthocamera.cpp | 8 +- .../_libs/cmp_mesh/jrt/jrtorthocamera.h | 2 +- .../_libs/cmp_mesh/jrt/jrtppmimage.cpp | 6 +- .../cmp_mesh/jrt/jrttriangleintersection.cpp | 10 +- .../cmp_mesh/jrt/jrttriangleintersection.h | 2 +- applications/_libs/cmp_mesh/mesh.h | 2 +- applications/_libs/cmp_mesh/overdraw.cpp | 4 +- applications/_libs/cmp_mesh/soup.cpp | 2 +- applications/_libs/cmp_mesh/souptomesh.cpp | 2 +- applications/_libs/cmp_mesh/stripifier.cpp | 2 +- applications/_libs/cmp_mesh/stripifier.h | 2 +- applications/_libs/cmp_mesh/timer.cpp | 4 +- applications/_libs/cmp_mesh/tootlelib.cpp | 2 +- .../_libs/cmp_mesh/tootleraytracer.cpp | 16 +-- .../_libs/cmp_meshcompressor/cmakelists.txt | 6 +- applications/_libs/gpu_decode/cmakelists.txt | 14 +- applications/_libs/gpu_decode/gpu_decode.cpp | 8 +- applications/_libs/gpu_decode/gpu_decode.h | 2 +- .../_libs/gpu_decode/gpu_decodebase.cpp | 6 +- .../_libs/gpu_decode/gpu_decodebase.h | 4 +- .../_plugins/atiformats/cmakelists.txt | 6 +- .../_plugins/c3dmodel_loaders/cmakelists.txt | 2 +- .../c3dmodel_loaders/drc/cmakelists.txt | 6 +- .../c3dmodel_loaders/drc/modelloader_drc.cpp | 2 +- .../c3dmodel_loaders/drc/modelloader_drc.h | 6 +- .../c3dmodel_loaders/gltf_20/cmakelists.txt | 6 +- .../c3dmodel_loaders/gltf_20/gltf_20.cpp | 10 +- .../c3dmodel_loaders/gltf_20/gltf_20.h | 4 +- .../c3dmodel_loaders/obj/meshobjloader.cpp | 2 +- .../c3dmodel_loaders/obj/meshobjloader.h | 2 +- .../_plugins/c3dmodel_loaders/obj/obj_10.cpp | 10 +- .../_plugins/c3dmodel_loaders/obj/obj_10.h | 6 +- .../c3dmodel_loaders/obj/objloader.cpp | 2 +- .../_plugins/c3dmodel_loaders/obj/objloader.h | 2 +- .../_plugins/c3dmodel_viewers/cmakelists.txt | 8 +- .../gltf_dx12_ex/cmakelists.txt | 2 +- .../gltf_dx12_ex/dx12util/bloom.cpp | 14 +- .../gltf_dx12_ex/dx12util/bloom.h | 2 +- .../gltf_dx12_ex/dx12util/blurps.cpp | 16 +-- .../gltf_dx12_ex/dx12util/blurps.h | 2 +- .../gltf_dx12_ex/dx12util/camera.cpp | 4 +- .../gltf_dx12_ex/dx12util/camera.h | 2 +- .../dx12util/commandlistringdx12.cpp | 4 +- .../dx12util/commandlistringdx12.h | 4 +- .../gltf_dx12_ex/dx12util/drawcube.cpp | 4 +- .../gltf_dx12_ex/dx12util/drawcube.h | 8 +- .../dx12util/dynamicbufferringdx12.cpp | 6 +- .../dx12util/dynamicbufferringdx12.h | 4 +- .../gltf_dx12_ex/dx12util/fencedx12.cpp | 4 +- .../dx12util/frameworkwindows.cpp | 2 +- .../gltf_dx12_ex/dx12util/frameworkwindows.h | 2 +- .../dx12util/gputimestampsdx12.cpp | 4 +- .../gltf_dx12_ex/dx12util/imguidx12.cpp | 2 +- .../gltf_dx12_ex/dx12util/imguidx12.h | 8 +- .../gltf_dx12_ex/dx12util/keyboardmouse.cpp | 2 +- .../gltf_dx12_ex/dx12util/keyboardmouse.h | 2 +- .../gltf_dx12_ex/dx12util/postproccs.cpp | 12 +- .../gltf_dx12_ex/dx12util/postprocps.cpp | 12 +- .../gltf_dx12_ex/dx12util/postprocps.h | 4 +- .../dx12util/resourceviewheapsdx12.cpp | 4 +- .../gltf_dx12_ex/dx12util/ring.cpp | 2 +- .../gltf_dx12_ex/dx12util/ring.h | 2 +- .../gltf_dx12_ex/dx12util/skydome.cpp | 10 +- .../gltf_dx12_ex/dx12util/skydome.h | 4 +- .../dx12util/staticbufferpooldx12.cpp | 6 +- .../dx12util/staticbufferpooldx12.h | 2 +- .../dx12util/staticconstantbufferpooldx12.cpp | 4 +- .../dx12util/staticconstantbufferpooldx12.h | 2 +- .../gltf_dx12_ex/dx12util/swapchaindx12.cpp | 4 +- .../gltf_dx12_ex/dx12util/swapchaindx12.h | 2 +- .../gltf_dx12_ex/dx12util/texturedx12.cpp | 8 +- .../gltf_dx12_ex/dx12util/texturedx12.h | 16 +-- .../gltf_dx12_ex/dx12util/threadpool.cpp | 2 +- .../gltf_dx12_ex/dx12util/tonemapping.cpp | 8 +- .../gltf_dx12_ex/dx12util/tonemapping.h | 4 +- .../gltf_dx12_ex/dx12util/uploadheapdx12.cpp | 6 +- .../gltf_dx12_ex/gltf_dx12_ex.cpp | 12 +- .../gltf_dx12_ex/gltf_dx12_ex.h | 4 +- .../gltf_dx12_ex/gltf_dx12deviceex.cpp | 14 +- .../gltf_dx12_ex/gltf_dx12deviceex.h | 16 +-- .../gltf_dx12_ex/gltf_dx12rendererex.cpp | 10 +- .../gltf_dx12_ex/gltf_dx12rendererex.h | 50 +++---- .../gltf_opengl/gltf_ogldevice.cpp | 2 +- .../gltf_opengl/gltf_ogldevice.h | 23 ++- .../gltf_opengl/gltf_opengl.cpp | 10 +- .../gltf_opengl/gltf_opengl.h | 4 +- .../c3dmodel_viewers/gltf_opengl/meshdata.cpp | 4 +- .../c3dmodel_viewers/gltf_opengl/meshdata.h | 2 +- .../c3dmodel_viewers/vulkan/cmakelists.txt | 2 +- .../c3dmodel_viewers/vulkan/util/camera.cpp | 2 +- .../vulkan/util/commandlistringvk.cpp | 4 +- .../vulkan/util/commandlistringvk.h | 2 +- .../c3dmodel_viewers/vulkan/util/devicevk.cpp | 2 +- .../vulkan/util/dynamicbufferringvk.cpp | 4 +- .../vulkan/util/dynamicbufferringvk.h | 4 +- .../vulkan/util/frameworkwindows.cpp | 2 +- .../c3dmodel_viewers/vulkan/util/imguivk.cpp | 4 +- .../c3dmodel_viewers/vulkan/util/imguivk.h | 6 +- .../vulkan/util/keyboardmouse.cpp | 2 +- .../vulkan/util/resourceviewheapsvk.cpp | 4 +- .../c3dmodel_viewers/vulkan/util/ring.cpp | 2 +- .../c3dmodel_viewers/vulkan/util/ring.h | 2 +- .../vulkan/util/shadercompilerhelper.cpp | 2 +- .../vulkan/util/staticbufferpoolvk.cpp | 4 +- .../vulkan/util/staticbufferpoolvk.h | 4 +- .../util/staticconstantbufferpoolvk.cpp | 2 +- .../vulkan/util/staticconstantbufferpoolvk.h | 4 +- .../vulkan/util/swapchainvk.cpp | 4 +- .../vulkan/util/swapchainvk.h | 2 +- .../vulkan/util/texturevk.cpp | 8 +- .../c3dmodel_viewers/vulkan/util/texturevk.h | 18 +-- .../vulkan/util/threadpool.cpp | 2 +- .../vulkan/util/trianglevk.cpp | 4 +- .../c3dmodel_viewers/vulkan/util/trianglevk.h | 6 +- .../vulkan/util/uploadheapvk.cpp | 6 +- .../c3dmodel_viewers/vulkan/vulkan_device.cpp | 8 +- .../c3dmodel_viewers/vulkan/vulkan_device.h | 18 +-- .../c3dmodel_viewers/vulkan/vulkan_main.cpp | 14 +- .../c3dmodel_viewers/vulkan/vulkan_main.h | 4 +- .../vulkan/vulkan_renderer.cpp | 12 +- .../c3dmodel_viewers/vulkan/vulkan_renderer.h | 20 +-- .../_plugins/canalysis/analysis/canalysis.cpp | 12 +- .../_plugins/canalysis/analysis/canalysis.h | 10 +- .../_plugins/canalysis/cmakelists.txt | 33 +++-- .../_plugins/ccmp_encode/cmakelists.txt | 14 +- .../_plugins/ccmp_encode/hpc/ccpu_hpc.cpp | 8 +- .../_plugins/ccmp_encode/hpc/ccpu_hpc.h | 8 +- .../_plugins/ccmp_encode/hpc/cmp_hpc.h | 2 +- .../ccmp_encode/hpc/compute_cpu_hpc.cpp | 4 +- .../ccmp_encode/hpc/compute_cpu_hpc.h | 2 +- applications/_plugins/ccmp_sdk/bc1/bc1.cpp | 6 +- applications/_plugins/ccmp_sdk/bc1/bc1.h | 8 +- .../_plugins/ccmp_sdk/bc1/cmakelists.txt | 4 +- applications/_plugins/ccmp_sdk/bc2/bc2.cpp | 2 +- applications/_plugins/ccmp_sdk/bc2/bc2.h | 8 +- .../_plugins/ccmp_sdk/bc2/cmakelists.txt | 4 +- applications/_plugins/ccmp_sdk/bc3/bc3.cpp | 2 +- applications/_plugins/ccmp_sdk/bc3/bc3.h | 8 +- .../_plugins/ccmp_sdk/bc3/cmakelists.txt | 4 +- applications/_plugins/ccmp_sdk/bc4/bc4.cpp | 2 +- applications/_plugins/ccmp_sdk/bc4/bc4.h | 8 +- .../_plugins/ccmp_sdk/bc4/cmakelists.txt | 4 +- applications/_plugins/ccmp_sdk/bc5/bc5.cpp | 4 +- applications/_plugins/ccmp_sdk/bc5/bc5.h | 8 +- .../_plugins/ccmp_sdk/bc5/cmakelists.txt | 4 +- applications/_plugins/ccmp_sdk/bc6/bc6h.cpp | 2 +- applications/_plugins/ccmp_sdk/bc6/bc6h.h | 8 +- .../_plugins/ccmp_sdk/bc6/cmakelists.txt | 4 +- applications/_plugins/ccmp_sdk/bc7/bc7.cpp | 2 +- applications/_plugins/ccmp_sdk/bc7/bc7.h | 8 +- .../_plugins/ccmp_sdk/bc7/cmakelists.txt | 4 +- applications/_plugins/ccmp_sdk/cmakelists.txt | 14 +- applications/_plugins/cfilter/boxfilter.cpp | 16 ++- applications/_plugins/cfilter/boxfilter.h | 8 +- applications/_plugins/cfilter/cmakelists.txt | 32 +++-- .../_plugins/cfilter_fx/CMakeLists.txt | 36 +++++ applications/_plugins/cfilter_fx/filterfx.cpp | 114 +++++++++++++++ applications/_plugins/cfilter_fx/filterfx.h | 56 ++++++++ .../_plugins/cgpudecode/cmakelists.txt | 6 +- .../_plugins/cgpudecode/directx/cdirectx.cpp | 10 +- .../_plugins/cgpudecode/directx/cdirectx.h | 4 +- .../cgpudecode/directx/gpu_directx.cpp | 16 +-- .../_plugins/cgpudecode/directx/gpu_directx.h | 6 +- .../_plugins/cgpudecode/opengl/cmakelists.txt | 8 +- .../_plugins/cgpudecode/opengl/copengl.cpp | 8 +- .../_plugins/cgpudecode/opengl/copengl.h | 4 +- .../_plugins/cgpudecode/opengl/gpu_opengl.cpp | 8 +- .../_plugins/cgpudecode/opengl/gpu_opengl.h | 6 +- .../_plugins/cgpudecode/vulkan/cvulkan.cpp | 8 +- .../_plugins/cgpudecode/vulkan/cvulkan.h | 4 +- .../_plugins/cgpudecode/vulkan/gpu_vulkan.cpp | 2 +- .../_plugins/cgpudecode/vulkan/gpu_vulkan.h | 2 +- .../cgpudecode/vulkan/vulkanswapchain.hpp | 2 +- applications/_plugins/cimage/astc/castc.cpp | 10 +- applications/_plugins/cimage/astc/castc.h | 2 +- .../_plugins/cimage/astc/cmakelists.txt | 4 +- applications/_plugins/cimage/cmakelists.txt | 10 +- .../_plugins/cimage/dds/cmakelists.txt | 16 +-- applications/_plugins/cimage/dds/dds.cpp | 16 +-- applications/_plugins/cimage/dds/dds.h | 2 +- applications/_plugins/cimage/dds/dds_dx10.cpp | 18 +-- applications/_plugins/cimage/dds/dds_dx10.h | 4 +- applications/_plugins/cimage/dds/dds_file.cpp | 16 +-- applications/_plugins/cimage/dds/dds_file.h | 2 +- .../_plugins/cimage/dds/dds_helpers.cpp | 10 +- .../_plugins/cimage/dds/dds_helpers.h | 6 +- .../_plugins/cimage/exr/cmakelists.txt | 4 +- applications/_plugins/cimage/exr/exr.cpp | 10 +- applications/_plugins/cimage/exr/exr.h | 2 +- applications/_plugins/cimage/ktx/cktx.h | 2 +- .../_plugins/cimage/ktx/cmakelists.txt | 8 +- applications/_plugins/cimage/ktx/ktx.cpp | 10 +- .../_plugins/cimage/tga/cmakelists.txt | 4 +- applications/_plugins/cimage/tga/tga.cpp | 10 +- applications/_plugins/cimage/tga/tga.h | 2 +- applications/_plugins/cmakelists.txt | 50 ++++--- applications/_plugins/cmdline/cmakelists.txt | 12 +- applications/_plugins/cmesh/cmakelists.txt | 2 +- .../cmesh/mesh_compressor/mesh_compressor.h | 10 +- .../cmesh/mesh_optimizer/mesh_optimizer.h | 10 +- .../_plugins/cmesh/tootle/cmakelists.txt | 4 +- .../_plugins/cmesh/tootle/mesh_tootle.cpp | 12 +- .../_plugins/cmesh/tootle/mesh_tootle.h | 4 +- applications/_plugins/cmesh/tootle/timer.cpp | 4 +- applications/_plugins/cmp_d3dx/d3d9module.cpp | 2 +- applications/_plugins/cmp_d3dx/d3d9module.h | 2 +- applications/_plugins/cmp_d3dx/d3dxmodule.cpp | 2 +- applications/_plugins/cmp_d3dx/d3dxmodule.h | 2 +- applications/_plugins/cmp_d3dx/module.cpp | 4 +- applications/_plugins/cmp_gpu/cmakelists.txt | 10 +- .../_plugins/cmp_gpu/directx/cdirectx.cpp | 10 +- .../_plugins/cmp_gpu/directx/cdirectx.h | 10 +- .../_plugins/cmp_gpu/directx/cmakelists.txt | 16 +-- .../cmp_gpu/directx/compute_directx.cpp | 2 +- .../cmp_gpu/directx/compute_directx.h | 8 +- .../_plugins/cmp_gpu/gpuhw/cgpuhw.cpp | 10 +- applications/_plugins/cmp_gpu/gpuhw/cgpuhw.h | 10 +- .../_plugins/cmp_gpu/gpuhw/cmakelists.txt | 24 ++-- .../_plugins/cmp_gpu/gpuhw/compute_gpuhw.cpp | 4 +- .../_plugins/cmp_gpu/gpuhw/compute_gpuhw.h | 10 +- .../_plugins/cmp_gpu/opencl/cmakelists.txt | 16 +-- .../cmp_gpu/opencl/compute_opencl.cpp | 12 +- .../_plugins/cmp_gpu/opencl/compute_opencl.h | 10 +- .../_plugins/cmp_gpu/opencl/copencl.cpp | 10 +- .../_plugins/cmp_gpu/opencl/copencl.h | 8 +- applications/_plugins/common/atiformats.cpp | 6 +- applications/_plugins/common/atiformats.h | 8 +- .../_plugins/common/c_exr/cmakelists.txt | 6 +- applications/_plugins/common/cexr.cpp | 2 +- applications/_plugins/common/cexr.h | 8 +- applications/_plugins/common/cmdline.cpp | 30 ++-- applications/_plugins/common/cmdline.h | 6 +- applications/_plugins/common/cmp_fileio.cpp | 4 +- .../_plugins/common/common_kerneldef.h | 2 +- .../_plugins/common/gltf/cmakelists.txt | 26 ++-- .../common/gltf/dx12/gltfbboxpass.cpp | 8 +- .../_plugins/common/gltf/dx12/gltfbboxpass.h | 8 +- .../common/gltf/dx12/gltfdepthpass.cpp | 12 +- .../_plugins/common/gltf/dx12/gltfdepthpass.h | 4 +- .../common/gltf/dx12/gltfhelpers_dx12.cpp | 4 +- .../_plugins/common/gltf/dx12/gltfpbr.cpp | 14 +- .../_plugins/common/gltf/dx12/gltfpbr.h | 8 +- .../common/gltf/dx12/gltftechnique.cpp | 2 +- .../_plugins/common/gltf/dx12/gltftechnique.h | 12 +- applications/_plugins/common/gltf/error.cpp | 2 +- .../_plugins/common/gltf/gltfcommon.cpp | 4 +- .../_plugins/common/gltf/gltfcommon.h | 10 +- .../_plugins/common/gltf/gltfhelpers.cpp | 2 +- .../_plugins/common/gltf/gltfhelpers.h | 2 +- .../_plugins/common/gltf/gltfstructures.h | 2 +- .../_plugins/common/gltf/tiny_gltf2.h | 4 +- .../_plugins/common/gltf/tiny_gltf2_utils.cpp | 4 +- .../common/gltf/vulkan/gltfbboxpassvk.cpp | 22 +-- .../common/gltf/vulkan/gltfbboxpassvk.h | 4 +- .../common/gltf/vulkan/gltfdepthpassvk.cpp | 22 +-- .../common/gltf/vulkan/gltfdepthpassvk.h | 4 +- .../common/gltf/vulkan/gltfhelpers_vulkan.cpp | 2 +- .../_plugins/common/gltf/vulkan/gltfpbrvk.cpp | 22 +-- .../_plugins/common/gltf/vulkan/gltfpbrvk.h | 6 +- .../common/gltf/vulkan/gltftechnique.cpp | 8 +- .../common/gltf/vulkan/gltftechnique.h | 2 +- .../common/hpc_compress/cmakelists.txt | 2 +- .../_plugins/common/kernel_def/cmakelists.txt | 2 +- applications/_plugins/common/mipstoqimage.cpp | 4 +- applications/_plugins/common/mipstoqimage.h | 4 +- applications/_plugins/common/misc.cpp | 2 +- applications/_plugins/common/misc.h | 2 +- .../_plugins/common/misc/cmakelists.txt | 4 +- .../common/model_viewer/cmakelists.txt | 4 +- .../common/model_viewer/modeltexture.cpp | 14 +- .../common/model_viewer/modeltexture.h | 4 +- applications/_plugins/common/modeldata.cpp | 4 +- applications/_plugins/common/modeldata.h | 2 +- applications/_plugins/common/pluginbase.h | 6 +- .../_plugins/common/plugininterface.h | 12 +- .../_plugins/common/pluginmanager.cpp | 4 +- applications/_plugins/common/pluginmanager.h | 4 +- applications/_plugins/common/psnr.cpp | 2 +- applications/_plugins/common/psnr.h | 2 +- .../_plugins/common/qtimgui/cmakelists.txt | 12 +- .../_plugins/common/qtimgui/imgui_dx12.h | 2 +- .../common/qtimgui/imgui_dx12renderer.cpp | 10 +- .../common/qtimgui/imgui_dx12renderer.h | 8 +- .../_plugins/common/qtimgui/imgui_opengl.h | 2 +- .../common/qtimgui/imgui_openglrenderer.cpp | 10 +- applications/_plugins/common/query_timer.h | 4 +- applications/_plugins/common/ssim.cpp | 4 +- applications/_plugins/common/ssim.h | 4 +- applications/_plugins/common/tc_pluginapi.h | 8 +- .../_plugins/common/tc_plugininternal.cpp | 4 +- .../_plugins/common/tc_plugininternal.h | 6 +- .../common/test_report/cmakelists.txt | 2 +- applications/_plugins/common/texture.h | 2 +- applications/_plugins/common/textureio.cpp | 16 +-- applications/_plugins/common/textureio.h | 6 +- .../_plugins/common/userinterface.cpp | 2 +- .../_plugins/common/util_funcs/cmakelists.txt | 4 +- applications/_plugins/common/utilfuncs.cpp | 4 +- applications/_plugins/common/utilfuncs.h | 2 +- applications/_plugins/gltf/cmakelists.txt | 25 ++-- .../_plugins/gltf/dx12/cmakelists.txt | 26 ++-- .../_plugins/gltf/vulkan/cmakelists.txt | 22 +-- applications/_plugins/half/cmakelists.txt | 12 +- applications/_plugins/json/cmakelists.txt | 2 +- .../_plugins/modelviewer/cmakelists.txt | 6 +- .../_plugins/pluginmanager/cmakelists.txt | 18 +-- applications/_plugins/psnr/cmakelists.txt | 16 +-- .../_plugins/tcpluginapi/cmakelists.txt | 12 +- .../_plugins/userinterface/cmakelists.txt | 6 +- applications/cmakelists.txt | 8 +- applications/compressonatorcli/cmakelists.txt | 81 ++++++++--- .../compressonatorcli/resources/mainapp.rc | Bin 4278 -> 4278 bytes .../source/compressonatorcli.cpp | 6 +- .../compressonatorcli/tests/cmakelists.txt | 2 +- applications/compressonatorgui/cmakelists.txt | 47 +++--- .../compressonatorgui/common/cmakelists.txt | 4 +- .../compressonatorgui/common/cptreewidget.cpp | 4 +- .../components/ac3dmeshanalysis.cpp | 4 +- .../components/ac3dmeshanalysis.h | 4 +- .../components/acaboutdlg.cpp | 4 +- .../compressonatorgui/components/acaboutdlg.h | 4 +- .../components/accustomdockwidget.cpp | 2 +- .../components/accustomdockwidget.h | 2 +- .../components/accustomgraphics.cpp | 2 +- .../components/accustomgraphics.h | 2 +- .../components/acdiffimage.cpp | 2 +- .../components/acdockwidgettitlebar.cpp | 2 +- .../components/acexrtool.cpp | 2 +- .../components/acimageview.cpp | 2 +- .../components/acimageview.h | 6 +- .../components/acoglwidget.cpp | 2 +- .../components/acoglwidget.h | 6 +- .../components/acprogressanimationwidget.cpp | 4 +- .../components/acprogressdlg.cpp | 4 +- .../components/actableimagedatamodel.cpp | 2 +- .../components/cmakelists.txt | 116 +++++++-------- .../components/cp3dmodelcompare.cpp | 4 +- .../components/cp3dmodelcompare.h | 10 +- .../components/cp3dmodelconvert.cpp | 6 +- .../components/cp3dmodelview.cpp | 6 +- .../components/cp3dmodelview.h | 8 +- .../components/cpcompressstatus.cpp | 2 +- .../components/cpcompressstatus.h | 8 +- .../components/cpgenmips.cpp | 2 +- .../compressonatorgui/components/cpgenmips.h | 2 +- .../components/cpimageanalysis.cpp | 2 +- .../components/cpimageanalysis.h | 6 +- .../components/cpimagecompare.cpp | 4 +- .../components/cpimagecompare.h | 10 +- .../components/cpimagefiledata.h | 4 +- .../components/cpimageloader.cpp | 5 +- .../components/cpimageloader.h | 10 +- .../components/cpimagepropertyview.cpp | 2 +- .../components/cpimagepropertyview.h | 4 +- .../components/cpimageview.cpp | 10 +- .../components/cpimageview.h | 10 +- .../components/cpnewproject.cpp | 2 +- .../components/cpprojectdata.h | 12 +- .../components/cpprojectview.cpp | 6 +- .../components/cpprojectview.h | 26 ++-- .../components/cpsetapplicationoptions.cpp | 2 +- .../components/cpsetapplicationoptions.h | 2 +- .../components/cpsetcompressoptions.cpp | 6 +- .../components/cpsetcompressoptions.h | 8 +- .../components/cpsetmeshoptions.cpp | 2 +- .../components/cpsetmeshoptions.h | 6 +- .../components/cpstartuppage.cpp | 2 +- .../components/cpwelcomepage.cpp | 2 +- .../components/cpwelcomepage.h | 4 +- .../compressonatorgui/copyfiles.cmake | 24 ++-- .../source/cpmaincomponents.cpp | 12 +- .../source/cpmaincomponents.h | 34 ++--- .../compressonatorgui/source/main.cpp | 8 +- cmakelists.txt | 71 ++++++--- cmp_compressonatorlib/apc/apc_decode.cpp | 2 +- cmp_compressonatorlib/apc/apc_decode.h | 2 +- cmp_compressonatorlib/apc/apc_definitions.h | 2 +- cmp_compressonatorlib/apc/apc_encode.cpp | 2 +- cmp_compressonatorlib/apc/apc_encode.h | 2 +- cmp_compressonatorlib/apc/codec_apc.cpp | 6 +- cmp_compressonatorlib/apc/codec_apc.h | 8 +- cmp_compressonatorlib/astc/astc_decode.cpp | 6 +- cmp_compressonatorlib/astc/astc_decode.h | 2 +- cmp_compressonatorlib/astc/astc_encode.cpp | 8 +- cmp_compressonatorlib/astc/astc_encode.h | 4 +- .../astc/astc_encode_kernel.cpp | 2 +- cmp_compressonatorlib/astc/astc_host.cpp | 6 +- cmp_compressonatorlib/astc/astc_host.h | 2 +- cmp_compressonatorlib/astc/astc_library.cpp | 8 +- cmp_compressonatorlib/astc/codec_astc.cpp | 14 +- cmp_compressonatorlib/astc/codec_astc.h | 12 +- cmp_compressonatorlib/atc/codec_atc.cpp | 8 +- cmp_compressonatorlib/atc/codec_atc.h | 2 +- cmp_compressonatorlib/atc/codec_atc_rgb.cpp | 6 +- cmp_compressonatorlib/atc/codec_atc_rgb.h | 2 +- .../atc/codec_atc_rgba_explicit.cpp | 4 +- .../atc/codec_atc_rgba_explicit.h | 2 +- .../atc/codec_atc_rgba_interpolated.cpp | 4 +- .../atc/codec_atc_rgba_interpolated.h | 2 +- cmp_compressonatorlib/ati/codec_ati1n.cpp | 6 +- cmp_compressonatorlib/ati/codec_ati1n.h | 2 +- cmp_compressonatorlib/ati/codec_ati2n.cpp | 6 +- cmp_compressonatorlib/ati/codec_ati2n.h | 2 +- .../ati/codec_ati2n_dxt5.cpp | 4 +- cmp_compressonatorlib/ati/codec_ati2n_dxt5.h | 2 +- cmp_compressonatorlib/ati/codec_ati_tc.cpp | 2 +- .../ati/compressonatori_tc.c | 2 +- .../ati/compressonatorxcodec.cpp | 6 +- cmp_compressonatorlib/basis/codec_basis.cpp | 6 +- cmp_compressonatorlib/basis/codec_basis.h | 4 +- cmp_compressonatorlib/bc6h/bc6h_decode.cpp | 13 +- cmp_compressonatorlib/bc6h/bc6h_decode.h | 4 +- .../bc6h/bc6h_definitions.cpp | 2 +- cmp_compressonatorlib/bc6h/bc6h_definitions.h | 2 +- cmp_compressonatorlib/bc6h/bc6h_encode.cpp | 12 +- cmp_compressonatorlib/bc6h/bc6h_encode.h | 4 +- cmp_compressonatorlib/bc6h/bc6h_library.cpp | 10 +- cmp_compressonatorlib/bc6h/bc6h_library.h | 4 +- cmp_compressonatorlib/bc6h/bc6h_utils.cpp | 4 +- cmp_compressonatorlib/bc6h/bc6h_utils.h | 2 +- cmp_compressonatorlib/bc6h/codec_bc6h.cpp | 14 +- cmp_compressonatorlib/bc6h/codec_bc6h.h | 10 +- cmp_compressonatorlib/bc7/3dquant_vpc.cpp | 4 +- cmp_compressonatorlib/bc7/bc7_decode.cpp | 12 +- cmp_compressonatorlib/bc7/bc7_decode.h | 2 +- cmp_compressonatorlib/bc7/bc7_definitions.cpp | 2 +- cmp_compressonatorlib/bc7/bc7_definitions.h | 4 +- cmp_compressonatorlib/bc7/bc7_encode.cpp | 10 +- cmp_compressonatorlib/bc7/bc7_encode.h | 2 +- cmp_compressonatorlib/bc7/bc7_library.cpp | 10 +- cmp_compressonatorlib/bc7/bc7_partitions.cpp | 2 +- cmp_compressonatorlib/bc7/bc7_partitions.h | 2 +- cmp_compressonatorlib/bc7/bc7_utils.cpp | 4 +- cmp_compressonatorlib/bc7/bc7_utils.h | 2 +- cmp_compressonatorlib/bc7/codec_bc7.cpp | 8 +- cmp_compressonatorlib/bc7/codec_bc7.h | 10 +- cmp_compressonatorlib/bc7/reconstruct.h | 2 +- cmp_compressonatorlib/bc7/shake.cpp | 4 +- cmp_compressonatorlib/block/codec_block.cpp | 4 +- cmp_compressonatorlib/block/codec_block.h | 2 +- .../block/codec_block_4x4.cpp | 4 +- cmp_compressonatorlib/block/codec_block_4x4.h | 2 +- .../block/codec_block_8x8.cpp | 4 +- cmp_compressonatorlib/block/codec_block_8x8.h | 2 +- cmp_compressonatorlib/buffer/codecbuffer.cpp | 42 +++--- cmp_compressonatorlib/buffer/codecbuffer.h | 6 +- .../buffer/codecbuffer_block.cpp | 4 +- .../buffer/codecbuffer_block.h | 2 +- .../buffer/codecbuffer_r16.cpp | 4 +- .../buffer/codecbuffer_r16.h | 2 +- .../buffer/codecbuffer_r16f.cpp | 4 +- .../buffer/codecbuffer_r16f.h | 2 +- .../buffer/codecbuffer_r32.cpp | 4 +- .../buffer/codecbuffer_r32.h | 2 +- .../buffer/codecbuffer_r32f.cpp | 4 +- .../buffer/codecbuffer_r32f.h | 2 +- .../buffer/codecbuffer_r8.cpp | 4 +- cmp_compressonatorlib/buffer/codecbuffer_r8.h | 2 +- .../buffer/codecbuffer_rg16.cpp | 4 +- .../buffer/codecbuffer_rg16.h | 2 +- .../buffer/codecbuffer_rg16f.cpp | 4 +- .../buffer/codecbuffer_rg16f.h | 2 +- .../buffer/codecbuffer_rg32.cpp | 4 +- .../buffer/codecbuffer_rg32.h | 2 +- .../buffer/codecbuffer_rg32f.cpp | 4 +- .../buffer/codecbuffer_rg32f.h | 2 +- .../buffer/codecbuffer_rg8.cpp | 4 +- .../buffer/codecbuffer_rg8.h | 2 +- .../buffer/codecbuffer_rgb888.cpp | 4 +- .../buffer/codecbuffer_rgb888.h | 2 +- .../buffer/codecbuffer_rgb9995ef.cpp | 4 +- .../buffer/codecbuffer_rgb9995ef.h | 2 +- .../buffer/codecbuffer_rgba16.cpp | 4 +- .../buffer/codecbuffer_rgba16.h | 2 +- .../buffer/codecbuffer_rgba16f.cpp | 5 +- .../buffer/codecbuffer_rgba16f.h | 2 +- .../buffer/codecbuffer_rgba2101010.cpp | 4 +- .../buffer/codecbuffer_rgba2101010.h | 2 +- .../buffer/codecbuffer_rgba32.cpp | 4 +- .../buffer/codecbuffer_rgba32.h | 2 +- .../buffer/codecbuffer_rgba32f.cpp | 4 +- .../buffer/codecbuffer_rgba32f.h | 2 +- .../buffer/codecbuffer_rgba8888.cpp | 4 +- .../buffer/codecbuffer_rgba8888.h | 2 +- cmp_compressonatorlib/cmakelists.txt | 123 ++++++++-------- cmp_compressonatorlib/common.h | 4 +- cmp_compressonatorlib/common/codec.cpp | 54 +++---- cmp_compressonatorlib/common/codec.h | 2 +- cmp_compressonatorlib/common/compress.h | 2 +- cmp_compressonatorlib/compress.cpp | 6 +- cmp_compressonatorlib/compressonator.cpp | 8 +- cmp_compressonatorlib/dxt/codec_dxt1.cpp | 8 +- cmp_compressonatorlib/dxt/codec_dxt1.h | 2 +- cmp_compressonatorlib/dxt/codec_dxt3.cpp | 6 +- cmp_compressonatorlib/dxt/codec_dxt3.h | 2 +- cmp_compressonatorlib/dxt/codec_dxt5.cpp | 8 +- cmp_compressonatorlib/dxt/codec_dxt5.h | 2 +- cmp_compressonatorlib/dxt/codec_dxt5_rbxg.cpp | 6 +- cmp_compressonatorlib/dxt/codec_dxt5_rbxg.h | 2 +- cmp_compressonatorlib/dxt/codec_dxt5_rgxb.cpp | 4 +- cmp_compressonatorlib/dxt/codec_dxt5_rgxb.h | 2 +- cmp_compressonatorlib/dxt/codec_dxt5_rxbg.cpp | 4 +- cmp_compressonatorlib/dxt/codec_dxt5_rxbg.h | 2 +- .../dxt/codec_dxt5_swizzled.cpp | 4 +- .../dxt/codec_dxt5_swizzled.h | 2 +- cmp_compressonatorlib/dxt/codec_dxt5_xgbr.cpp | 4 +- cmp_compressonatorlib/dxt/codec_dxt5_xgbr.h | 2 +- cmp_compressonatorlib/dxt/codec_dxt5_xgxr.cpp | 4 +- cmp_compressonatorlib/dxt/codec_dxt5_xgxr.h | 2 +- cmp_compressonatorlib/dxt/codec_dxt5_xrbg.cpp | 4 +- cmp_compressonatorlib/dxt/codec_dxt5_xrbg.h | 2 +- cmp_compressonatorlib/dxtc/codec_dxtc.cpp | 4 +- cmp_compressonatorlib/dxtc/codec_dxtc.h | 2 +- .../dxtc/codec_dxtc_alpha.cpp | 6 +- .../dxtc/codec_dxtc_rgba.cpp | 6 +- cmp_compressonatorlib/etc/codec_etc.cpp | 8 +- cmp_compressonatorlib/etc/codec_etc.h | 4 +- cmp_compressonatorlib/etc/codec_etc2.cpp | 2 +- cmp_compressonatorlib/etc/codec_etc2.h | 8 +- cmp_compressonatorlib/etc/codec_etc2_rgb.cpp | 8 +- cmp_compressonatorlib/etc/codec_etc2_rgb.h | 2 +- cmp_compressonatorlib/etc/codec_etc2_rgba.cpp | 4 +- cmp_compressonatorlib/etc/codec_etc2_rgba.h | 2 +- .../etc/codec_etc2_rgba1.cpp | 6 +- cmp_compressonatorlib/etc/codec_etc2_rgba1.h | 2 +- cmp_compressonatorlib/etc/codec_etc_rgb.cpp | 6 +- cmp_compressonatorlib/etc/codec_etc_rgb.h | 2 +- .../etc/codec_etc_rgba_explicit.cpp | 4 +- .../etc/codec_etc_rgba_explicit.h | 2 +- .../etc/codec_etc_rgba_interpolated.cpp | 4 +- .../etc/codec_etc_rgba_interpolated.h | 2 +- cmp_compressonatorlib/gt/codec_gt.cpp | 6 +- cmp_compressonatorlib/gt/codec_gt.h | 8 +- cmp_compressonatorlib/gt/gt_decode.cpp | 2 +- cmp_compressonatorlib/gt/gt_decode.h | 2 +- cmp_compressonatorlib/gt/gt_definitions.h | 2 +- cmp_compressonatorlib/gt/gt_encode.cpp | 2 +- cmp_compressonatorlib/gt/gt_encode.h | 2 +- cmp_core/cmakelists.txt | 35 ++--- cmp_core/shaders/bc1_encode_kernel.cpp | 4 +- cmp_core/shaders/bc1_encode_kernel.h | 4 +- cmp_core/shaders/bc2_encode_kernel.cpp | 2 +- cmp_core/shaders/bc2_encode_kernel.h | 4 +- cmp_core/shaders/bc3_encode_kernel.cpp | 2 +- cmp_core/shaders/bc3_encode_kernel.h | 4 +- cmp_core/shaders/bc4_encode_kernel.cpp | 2 +- cmp_core/shaders/bc4_encode_kernel.h | 4 +- cmp_core/shaders/bc5_encode_kernel.cpp | 2 +- cmp_core/shaders/bc5_encode_kernel.h | 4 +- cmp_core/shaders/bc6_encode_kernel.cpp | 2 +- cmp_core/shaders/bc6_encode_kernel.h | 2 +- cmp_core/shaders/bc7_encode_kernel.cpp | 4 +- cmp_core/shaders/bc7_encode_kernel.h | 7 +- cmp_core/shaders/bcn_common_kernel.h | 2 +- cmp_core/source/cmp_math_func.h | 2 +- cmp_core/test/cmakelists.txt | 10 +- cmp_core/test/compressonatortests.cpp | 8 +- cmp_core/test/testsmain.cpp | 2 +- cmp_framework/cmakelists.txt | 136 +++++++++--------- cmp_framework/common/cmp_boxfilter.cpp | 4 +- cmp_framework/common/cmp_boxfilter.h | 2 +- cmp_framework/common/cmp_mips.cpp | 11 +- cmp_framework/common/cmp_mips.h | 4 +- cmp_framework/common/half/half.cpp | 4 +- cmp_framework/common/half/half.h | 2 +- cmp_framework/common/half/halffunction.h | 2 +- cmp_framework/common/hdr_encode.cpp | 2 +- cmp_framework/compute_base.cpp | 19 ++- cmp_framework/compute_base.h | 8 +- .../source/gui_tool/getting_started/index.rst | 2 +- docs/source/gui_tool/user_guide/index.rst | 10 +- .../user_guide/index_3dmodelcompression.rst | 2 +- .../user_guide/index_introduction.rst | 2 +- .../user_guide/index_texturecompression.rst | 2 +- .../user_guide/index_themainwindow.rst | 12 +- examples/common/cmakelists.txt | 10 +- examples/common/dds_helpers.cpp | 4 +- examples/common/dds_helpers.h | 4 +- examples/core_example1/cmakelists.txt | 2 +- examples/core_example1/coreexample.cpp | 2 +- examples/framework_example1/cmakelists.txt | 6 +- .../framework_example1/framework_example1.cpp | 2 +- examples/framework_example2/cmakelists.txt | 6 +- .../framework_example2/framework_example2.cpp | 2 +- examples/framework_example3/cmakelists.txt | 6 +- .../framework_example3/framework_example3.cpp | 2 +- examples/framework_example4/cmakelists.txt | 6 +- .../framework_example4/framework_example4.cpp | 2 +- examples/prototype/cmakelists.txt | 18 +-- examples/sdk_example1/cmakelists.txt | 8 +- examples/sdk_example1/sdk_example1.cpp | 4 +- examples/sdk_example2/cmakelists.txt | 8 +- examples/sdk_example2/sdk_example2.cpp | 4 +- examples/sdk_example3/cmakelists.txt | 8 +- examples/sdk_example3/sdk_example3.cpp | 4 +- external/cmake/cmakelists.txt | 8 +- .../customtargets/customtarget_glew.cmake | 2 +- .../customtargets/customtarget_glslang.cmake | 2 +- .../customtargets/customtarget_libpng.cmake | 2 +- .../customtargets/customtarget_libtiff.cmake | 2 +- .../customtargets/customtarget_opencv.cmake | 2 +- .../customtargets/customtarget_openexr.cmake | 2 +- .../customtargets/customtarget_zlib.cmake | 2 +- .../customtargets/dependency_vulkan.cmake | 2 +- external/cmakelists.txt | 6 +- external/glew/cmakelists.txt | 5 +- external/glfw/cmakelists.txt | 5 +- external/ktx/cmakelists.txt | 25 ++-- external/opencv/cmakelists.txt | 4 +- external/openexr/cmakelists.txt | 21 +-- external/qt5/cmakelists.txt | 5 +- external/rapidxml/cmakelists.txt | 2 +- external/vulkan/cmakelists.txt | 22 +-- external/zlib/cmakelists.txt | 2 - gstyle.bat | 2 - installer/amdcompressgui_64.aip | 129 +++++++++-------- scripts/fetch_dependencies.py | 4 +- scripts/initsetup_ubuntu.sh | 24 ++++ scripts/linux_build_apps.sh | 6 + 655 files changed, 2648 insertions(+), 2321 deletions(-) create mode 100644 applications/_plugins/cfilter_fx/CMakeLists.txt create mode 100644 applications/_plugins/cfilter_fx/filterfx.cpp create mode 100644 applications/_plugins/cfilter_fx/filterfx.h delete mode 100644 gstyle.bat create mode 100644 scripts/initsetup_ubuntu.sh create mode 100644 scripts/linux_build_apps.sh diff --git a/applications/_libs/cmakelists.txt b/applications/_libs/cmakelists.txt index 50d45d37b..21be9ea0a 100644 --- a/applications/_libs/cmakelists.txt +++ b/applications/_libs/cmakelists.txt @@ -1,11 +1,11 @@ set(FOLDER_NAME _Libs) -add_subdirectory(CMP_Common) -add_subdirectory(CMP_FileIO) -add_subdirectory(CMP_GUI) -add_subdirectory(CMP_Math) -add_subdirectory(CMP_Mesh) -add_subdirectory(CMP_MeshCompressor) -add_subdirectory(CMP_MeshOptimizer) -add_subdirectory(GPU_Decode) +add_subdirectory(cmp_common) +add_subdirectory(cmp_fileio) +add_subdirectory(cmp_gui) +add_subdirectory(cmp_math) +add_subdirectory(cmp_mesh) +add_subdirectory(cmp_meshcompressor) +add_subdirectory(cmp_meshoptimizer) +add_subdirectory(gpu_decode) diff --git a/applications/_libs/cmp_common/cmakelists.txt b/applications/_libs/cmp_common/cmakelists.txt index bbbbe6162..587ebddab 100644 --- a/applications/_libs/cmp_common/cmakelists.txt +++ b/applications/_libs/cmp_common/cmakelists.txt @@ -2,26 +2,26 @@ add_library(CMP_Common INTERFACE) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../../../CMP_Framework) +set(LEGACY_LOCATION ../../../cmp_framework) target_sources(CMP_Common INTERFACE - ${LEGACY_LOCATION}/Compute_Base.cpp - ${LEGACY_LOCATION}/Compute_Base.h - ${LEGACY_LOCATION}/Common/CMP_BoxFilter.cpp - ${LEGACY_LOCATION}/Common/CMP_BoxFilter.h - ${LEGACY_LOCATION}/Common/CMP_MIPS.cpp - ${LEGACY_LOCATION}/Common/CMP_MIPS.h - ${LEGACY_LOCATION}/Common/HDR_Encode.cpp - ${LEGACY_LOCATION}/Common/HDR_Encode.h + ${LEGACY_LOCATION}/compute_base.cpp + ${LEGACY_LOCATION}/compute_base.h + ${LEGACY_LOCATION}/common/cmp_boxfilter.cpp + ${LEGACY_LOCATION}/common/cmp_boxfilter.h + ${LEGACY_LOCATION}/common/cmp_mips.cpp + ${LEGACY_LOCATION}/common/cmp_mips.h + ${LEGACY_LOCATION}/common/hdr_encode.cpp + ${LEGACY_LOCATION}/common/hdr_encode.h ) target_include_directories(CMP_Common INTERFACE - ./Common + ./common ./ ${LEGACY_LOCATION} - ${LEGACY_LOCATION}/Common + ${LEGACY_LOCATION}/common ) target_link_libraries(CMP_Common INTERFACE diff --git a/applications/_libs/cmp_fileio/cmakelists.txt b/applications/_libs/cmp_fileio/cmakelists.txt index 5a1a49d82..ecf1c5c8a 100644 --- a/applications/_libs/cmp_fileio/cmakelists.txt +++ b/applications/_libs/cmp_fileio/cmakelists.txt @@ -2,12 +2,12 @@ add_library(CMP_FileIO) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../../_Plugins/Common) +set(LEGACY_LOCATION ../../_plugins/common) target_sources(CMP_FileIO PRIVATE - ${LEGACY_LOCATION}/CMP_FileIO.cpp - ${LEGACY_LOCATION}/CMP_FileIO.h + ${LEGACY_LOCATION}/cmp_fileio.cpp + ${LEGACY_LOCATION}/cmp_fileio.h ) target_include_directories(CMP_FileIO PUBLIC diff --git a/applications/_libs/cmp_gui/cmakelists.txt b/applications/_libs/cmp_gui/cmakelists.txt index 857477f5e..8329d649e 100644 --- a/applications/_libs/cmp_gui/cmakelists.txt +++ b/applications/_libs/cmp_gui/cmakelists.txt @@ -2,23 +2,23 @@ add_library(CMP_GUI INTERFACE) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../../CompressonatorGUI) +set(LEGACY_LOCATION ../../compressonatorgui) target_sources(CMP_GUI INTERFACE - ${LEGACY_LOCATION}/Common/cvmatandqimage.cpp - ${LEGACY_LOCATION}/Common/cvmatandqimage.h - ${LEGACY_LOCATION}/Components/cpImageLoader.h - ${LEGACY_LOCATION}/Components/cpImageLoader.cpp + ${LEGACY_LOCATION}/common/cvmatandqimage.cpp + ${LEGACY_LOCATION}/common/cvmatandqimage.h + ${LEGACY_LOCATION}/components/cpimageloader.h + ${LEGACY_LOCATION}/components/cpimageloader.cpp ) target_include_directories(CMP_GUI INTERFACE - ./Common - ./Components + ./common + ./components ./ - ${LEGACY_LOCATION}/Common - ${LEGACY_LOCATION}/Components + ${LEGACY_LOCATION}/common + ${LEGACY_LOCATION}/components ${LEGACY_LOCATION} ) diff --git a/applications/_libs/cmp_math/cmakelists.txt b/applications/_libs/cmp_math/cmakelists.txt index 26ba26daa..b4f169cd4 100644 --- a/applications/_libs/cmp_math/cmakelists.txt +++ b/applications/_libs/cmp_math/cmakelists.txt @@ -2,7 +2,7 @@ add_library(CMP_Math) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../../../CMP_Framework/Common) +set(LEGACY_LOCATION ../../../cmp_framework/common) target_sources(CMP_Math PRIVATE @@ -10,17 +10,17 @@ target_sources(CMP_Math PRIVATE cmp_math_common.h cmp_math_cpuid.cpp cmp_math_cpuid.h - JML.h - JMLFuncs.cpp - JMLFuncs.h - JMLMatrix.h - JMLScalar.h - JMLSSEVec.h - JMLVec2.h - JMLVec3.h - JRTCommon.h - ${LEGACY_LOCATION}/MathMacros.h - TootlePCH.h + jml.h + jmlfuncs.cpp + jmlfuncs.h + jmlmatrix.h + jmlscalar.h + jmlssevec.h + jmlvec2.h + jmlvec3.h + jrtcommon.h + ${LEGACY_LOCATION}/mathmacros.h + tootlepch.h ) target_include_directories(CMP_Math PUBLIC diff --git a/applications/_libs/cmp_math/cmp_math_common.h b/applications/_libs/cmp_math/cmp_math_common.h index 9fc81e11f..fa2068760 100644 --- a/applications/_libs/cmp_math/cmp_math_common.h +++ b/applications/_libs/cmp_math/cmp_math_common.h @@ -25,7 +25,7 @@ #ifndef CMP_MATH_COMMON_H #define CMP_MATH_COMMON_H -#include "Common_Def.h" +#include "common_def.h" #ifndef ASPM_GPU diff --git a/applications/_libs/cmp_math/jml.h b/applications/_libs/cmp_math/jml.h index d21a12929..629765935 100644 --- a/applications/_libs/cmp_math/jml.h +++ b/applications/_libs/cmp_math/jml.h @@ -31,10 +31,10 @@ #define ALIGN16 __declspec(align(16)) #endif -#include "JMLVec2.h" -#include "JMLVec3.h" -#include "JMLMatrix.h" -#include "JMLFuncs.h" +#include "jmlvec2.h" +#include "jmlvec3.h" +#include "jmlmatrix.h" +#include "jmlfuncs.h" diff --git a/applications/_libs/cmp_math/jmlfuncs.cpp b/applications/_libs/cmp_math/jmlfuncs.cpp index 8f12b0108..bbb6d5bfe 100644 --- a/applications/_libs/cmp_math/jmlfuncs.cpp +++ b/applications/_libs/cmp_math/jmlfuncs.cpp @@ -21,9 +21,9 @@ // //===================================================================== -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JMLFuncs.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jmlfuncs.h" #include diff --git a/applications/_libs/cmp_math/jmlfuncs.h b/applications/_libs/cmp_math/jmlfuncs.h index 5fc7f2e07..535b2daec 100644 --- a/applications/_libs/cmp_math/jmlfuncs.h +++ b/applications/_libs/cmp_math/jmlfuncs.h @@ -27,10 +27,10 @@ #include #include -#include "JMLVec2.h" -#include "JMLVec3.h" -#include "JMLMatrix.h" -#include "JMLSSEVec.h" +#include "jmlvec2.h" +#include "jmlvec3.h" +#include "jmlmatrix.h" +#include "jmlssevec.h" const float PI = 3.1415926f; const float E = 2.718281828f; diff --git a/applications/_libs/cmp_math/jrtcommon.h b/applications/_libs/cmp_math/jrtcommon.h index 0014f14b2..5cbd89845 100644 --- a/applications/_libs/cmp_math/jrtcommon.h +++ b/applications/_libs/cmp_math/jrtcommon.h @@ -9,7 +9,7 @@ /// epsilon value used in intersection computations. #define JRTEPSILON 0.00001f -#include "TootlePCH.h" +#include "tootlepch.h" #include @@ -22,7 +22,7 @@ typedef unsigned int UINT; typedef unsigned short USHORT; typedef unsigned char UBYTE; -#include "JML.h" +#include "jml.h" using namespace JML; #define JRT_ASSERT(x) assert(x) diff --git a/applications/_libs/cmp_mesh/clustering.cpp b/applications/_libs/cmp_mesh/clustering.cpp index 7de1fccf8..fc0b6ece3 100644 --- a/applications/_libs/cmp_mesh/clustering.cpp +++ b/applications/_libs/cmp_mesh/clustering.cpp @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" +#include "tootlepch.h" #include "soup.h" diff --git a/applications/_libs/cmp_mesh/cmakelists.txt b/applications/_libs/cmp_mesh/cmakelists.txt index 400a0594f..e53b64da5 100644 --- a/applications/_libs/cmp_mesh/cmakelists.txt +++ b/applications/_libs/cmp_mesh/cmakelists.txt @@ -31,13 +31,13 @@ target_sources(CMP_Mesh soup.h souptomesh.cpp souptomesh.h - Stripifier.cpp - Stripifier.h - Timer.cpp - Timer.h - TootlePCH.h - TootleRaytracer.cpp - TootleRaytracer.h + stripifier.cpp + stripifier.h + timer.cpp + timer.h + tootlepch.h + tootleraytracer.cpp + tootleraytracer.h triorder.cpp triorder.h vector.h @@ -45,12 +45,12 @@ target_sources(CMP_Mesh window.h ) -add_subdirectory(JRT) +add_subdirectory(jrt) target_include_directories(CMP_Mesh PUBLIC ./ - ./JRT/ + ./jrt/ ) target_link_libraries(CMP_Mesh PRIVATE @@ -82,7 +82,6 @@ if (OPTION_CMP_DIRECTX) endif() target_link_libraries(CMP_Mesh PRIVATE - ExtDirectX ) endif() diff --git a/applications/_libs/cmp_mesh/error.c b/applications/_libs/cmp_mesh/error.c index e93ecf0fc..c339b2ac4 100644 --- a/applications/_libs/cmp_mesh/error.c +++ b/applications/_libs/cmp_mesh/error.c @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" +#include "tootlepch.h" void error_output(const char *fmt, ...) { diff --git a/applications/_libs/cmp_mesh/feedback.cpp b/applications/_libs/cmp_mesh/feedback.cpp index 6cbcecc82..5b3e1622d 100644 --- a/applications/_libs/cmp_mesh/feedback.cpp +++ b/applications/_libs/cmp_mesh/feedback.cpp @@ -5,7 +5,7 @@ ****************************************************************************************/ #include "feedback.h" -#include "TootlePCH.h" +#include "tootlepch.h" #include "error.h" #include "heap.h" diff --git a/applications/_libs/cmp_mesh/fit.cpp b/applications/_libs/cmp_mesh/fit.cpp index 58c8174a9..9e242c9c5 100644 --- a/applications/_libs/cmp_mesh/fit.cpp +++ b/applications/_libs/cmp_mesh/fit.cpp @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" +#include "tootlepch.h" #include #include "bbox.h" diff --git a/applications/_libs/cmp_mesh/gdiwm.cpp b/applications/_libs/cmp_mesh/gdiwm.cpp index 01391b6dd..0eb4e08f6 100644 --- a/applications/_libs/cmp_mesh/gdiwm.cpp +++ b/applications/_libs/cmp_mesh/gdiwm.cpp @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" +#include "tootlepch.h" #include #ifdef _WIN32 #include "gdiwm.h" diff --git a/applications/_libs/cmp_mesh/heap.c b/applications/_libs/cmp_mesh/heap.c index 9d387b081..6d840b3d0 100644 --- a/applications/_libs/cmp_mesh/heap.c +++ b/applications/_libs/cmp_mesh/heap.c @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" +#include "tootlepch.h" #include "heap.h" typedef struct _t_heap_node { diff --git a/applications/_libs/cmp_mesh/jrt/cmakelists.txt b/applications/_libs/cmp_mesh/jrt/cmakelists.txt index 0633fc145..ca1bc2564 100644 --- a/applications/_libs/cmp_mesh/jrt/cmakelists.txt +++ b/applications/_libs/cmp_mesh/jrt/cmakelists.txt @@ -1,29 +1,29 @@ target_sources(CMP_Mesh PRIVATE - JRTBoundingBox.cpp - JRTBoundingBox.h - JRTCamera.cpp - JRTCamera.h - JRTCommon.h - JRTCore.cpp - JRTCore.h - JRTCoreUtils.cpp - JRTCoreUtils.h - JRTH2KDTreeBuilder.cpp - JRTH2KDTreeBuilder.h - JRTHeuristicKDTreeBuilder.cpp - JRTHeuristicKDTreeBuilder.h - JRTKDTree.cpp - JRTKDTree.h - JRTKDTreeBuilder.cpp - JRTKDTreeBuilder.h - JRTMesh.cpp - JRTMesh.h - JRTOrthoCamera.cpp - JRTOrthoCamera.h - JRTPPMImage.cpp - JRTPPMImage.h - JRTTriangleIntersection.cpp - JRTTriangleIntersection.h + jrtboundingbox.cpp + jrtboundingbox.h + jrtcamera.cpp + jrtcamera.h + jrtcommon.h + jrtcore.cpp + jrtcore.h + jrtcoreutils.cpp + jrtcoreutils.h + jrth2kdtreebuilder.cpp + jrth2kdtreebuilder.h + jrtheuristickdtreebuilder.cpp + jrtheuristickdtreebuilder.h + jrtkdtree.cpp + jrtkdtree.h + jrtkdtreebuilder.cpp + jrtkdtreebuilder.h + jrtmesh.cpp + jrtmesh.h + jrtorthocamera.cpp + jrtorthocamera.h + jrtppmimage.cpp + jrtppmimage.h + jrttriangleintersection.cpp + jrttriangleintersection.h ) diff --git a/applications/_libs/cmp_mesh/jrt/jrtboundingbox.cpp b/applications/_libs/cmp_mesh/jrt/jrtboundingbox.cpp index 4ef1dc485..4425a2290 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtboundingbox.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrtboundingbox.cpp @@ -3,9 +3,9 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTBoundingBox.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtboundingbox.h" #include JRTBoundingBox::JRTBoundingBox(const float* positions, unsigned int num_points) { diff --git a/applications/_libs/cmp_mesh/jrt/jrtboundingbox.h b/applications/_libs/cmp_mesh/jrt/jrtboundingbox.h index 3f050d854..d13b2efa6 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtboundingbox.h +++ b/applications/_libs/cmp_mesh/jrt/jrtboundingbox.h @@ -6,7 +6,7 @@ #ifndef _FRT_BOUNDING_BOX_H_ #define _FRT_BOUNDING_BOX_H_ -#include "JMLSSEVec.h" +#include "jmlssevec.h" typedef SSEVec4 SSEVector; diff --git a/applications/_libs/cmp_mesh/jrt/jrtcamera.cpp b/applications/_libs/cmp_mesh/jrt/jrtcamera.cpp index 8a4b964d8..59b2069b8 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtcamera.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrtcamera.cpp @@ -3,9 +3,9 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTCamera.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtcamera.h" /// \param position diff --git a/applications/_libs/cmp_mesh/jrt/jrtcamera.h b/applications/_libs/cmp_mesh/jrt/jrtcamera.h index d935f5e72..6a01611f8 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtcamera.h +++ b/applications/_libs/cmp_mesh/jrt/jrtcamera.h @@ -6,7 +6,7 @@ #ifndef _JRT_CAMERA_H_ #define _JRT_CAMERA_H_ -#include "JRTCommon.h" +#include "jrtcommon.h" class JRTCamera { diff --git a/applications/_libs/cmp_mesh/jrt/jrtcommon.h b/applications/_libs/cmp_mesh/jrt/jrtcommon.h index 0014f14b2..5cbd89845 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtcommon.h +++ b/applications/_libs/cmp_mesh/jrt/jrtcommon.h @@ -9,7 +9,7 @@ /// epsilon value used in intersection computations. #define JRTEPSILON 0.00001f -#include "TootlePCH.h" +#include "tootlepch.h" #include @@ -22,7 +22,7 @@ typedef unsigned int UINT; typedef unsigned short USHORT; typedef unsigned char UBYTE; -#include "JML.h" +#include "jml.h" using namespace JML; #define JRT_ASSERT(x) assert(x) diff --git a/applications/_libs/cmp_mesh/jrt/jrtcore.cpp b/applications/_libs/cmp_mesh/jrt/jrtcore.cpp index 5e54a931e..68b0ebaa4 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtcore.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrtcore.cpp @@ -3,15 +3,15 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTCore.h" -#include "JRTMesh.h" - -#include "JRTKDTree.h" -#include "JRTKDTreeBuilder.h" -#include "JRTHeuristicKDTreeBuilder.h" -#include "JRTH2KDTreeBuilder.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtcore.h" +#include "jrtmesh.h" + +#include "jrtkdtree.h" +#include "jrtkdtreebuilder.h" +#include "jrtheuristickdtreebuilder.h" +#include "jrth2kdtreebuilder.h" JRTCore::JRTCore() : m_pTree(NULL), m_pHitArray(new TootleRayHit[5]), m_nArraySize(5) { diff --git a/applications/_libs/cmp_mesh/jrt/jrtcore.h b/applications/_libs/cmp_mesh/jrt/jrtcore.h index a402f137c..5bcbd2347 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtcore.h +++ b/applications/_libs/cmp_mesh/jrt/jrtcore.h @@ -6,8 +6,8 @@ #ifndef _JRT_CORE_H_ #define _JRT_CORE_H_ -#include "JRTCommon.h" -#include "JRTTriangleIntersection.h" +#include "jrtcommon.h" +#include "jrttriangleintersection.h" struct JRTHitInfo { // the triangle that was hit diff --git a/applications/_libs/cmp_mesh/jrt/jrtcoreutils.cpp b/applications/_libs/cmp_mesh/jrt/jrtcoreutils.cpp index e1a0f679c..4a32ee479 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtcoreutils.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrtcoreutils.cpp @@ -3,10 +3,10 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTCoreUtils.h" -#include "JRTMesh.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtcoreutils.h" +#include "jrtmesh.h" // These arrays are used to implement the UCOMP, VCOMP, WCOMP macros diff --git a/applications/_libs/cmp_mesh/jrt/jrth2kdtreebuilder.cpp b/applications/_libs/cmp_mesh/jrt/jrth2kdtreebuilder.cpp index 9ac2a2866..14c7832de 100644 --- a/applications/_libs/cmp_mesh/jrt/jrth2kdtreebuilder.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrth2kdtreebuilder.cpp @@ -3,11 +3,11 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTKDTree.h" -#include "JRTH2KDTreeBuilder.h" -#include "JRTMesh.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtkdtree.h" +#include "jrth2kdtreebuilder.h" +#include "jrtmesh.h" static const int INTERSECT_COST = 5; diff --git a/applications/_libs/cmp_mesh/jrt/jrth2kdtreebuilder.h b/applications/_libs/cmp_mesh/jrt/jrth2kdtreebuilder.h index 5fa3be700..006f2941d 100644 --- a/applications/_libs/cmp_mesh/jrt/jrth2kdtreebuilder.h +++ b/applications/_libs/cmp_mesh/jrt/jrth2kdtreebuilder.h @@ -6,8 +6,8 @@ #ifndef _JRT_H2_KDTREE_BUILDER_H_ #define _JRT_H2_KDTREE_BUILDER_H_ -#include "JRTCoreUtils.h" -#include "JRTKDTreeBuilder.h" +#include "jrtcoreutils.h" +#include "jrtkdtreebuilder.h" /// The H2 KDTree builder is a simplified heuristic tree builder /// The algorithm works thusly: diff --git a/applications/_libs/cmp_mesh/jrt/jrtheuristickdtreebuilder.cpp b/applications/_libs/cmp_mesh/jrt/jrtheuristickdtreebuilder.cpp index 18e2e6afb..e6f48c3a3 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtheuristickdtreebuilder.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrtheuristickdtreebuilder.cpp @@ -3,13 +3,13 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTKDTree.h" -#include "JRTBoundingBox.h" -#include "JRTMesh.h" -#include "JRTHeuristicKDTreeBuilder.h" -#include "JRTCoreUtils.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtkdtree.h" +#include "jrtboundingbox.h" +#include "jrtmesh.h" +#include "jrtheuristickdtreebuilder.h" +#include "jrtcoreutils.h" #include diff --git a/applications/_libs/cmp_mesh/jrt/jrtheuristickdtreebuilder.h b/applications/_libs/cmp_mesh/jrt/jrtheuristickdtreebuilder.h index d84130993..43fb6da6f 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtheuristickdtreebuilder.h +++ b/applications/_libs/cmp_mesh/jrt/jrtheuristickdtreebuilder.h @@ -7,9 +7,9 @@ #define _JRT_HEURISTIC_KD_TREE_BUILDER_H_ -#include "JRTKDTreeBuilder.h" -#include "JRTBoundingBox.h" -#include "JRTCoreUtils.h" +#include "jrtkdtreebuilder.h" +#include "jrtboundingbox.h" +#include "jrtcoreutils.h" /// \brief A smart KD tree builder which uses the surface area heuristic /// Most of the inspiration for this code comes from Havran's PhD thesis diff --git a/applications/_libs/cmp_mesh/jrt/jrtkdtree.cpp b/applications/_libs/cmp_mesh/jrt/jrtkdtree.cpp index 55bc743d1..752f574d5 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtkdtree.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrtkdtree.cpp @@ -3,10 +3,10 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTKDTree.h" -#include "JRTMesh.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtkdtree.h" +#include "jrtmesh.h" const UINT JRTKDTree::MAX_TREE_DEPTH = 28; diff --git a/applications/_libs/cmp_mesh/jrt/jrtkdtree.h b/applications/_libs/cmp_mesh/jrt/jrtkdtree.h index 4e36a7d23..3265dc91c 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtkdtree.h +++ b/applications/_libs/cmp_mesh/jrt/jrtkdtree.h @@ -6,10 +6,10 @@ #ifndef _JRT_KDTREE_H_ #define _JRT_KDTREE_H_ -#include "JRTCommon.h" -#include "JRTBoundingBox.h" -#include "JRTTriangleIntersection.h" -#include "JRTCore.h" +#include "jrtcommon.h" +#include "jrtboundingbox.h" +#include "jrttriangleintersection.h" +#include "jrtcore.h" #ifdef _LINUX #include "../aligned_malloc.h" diff --git a/applications/_libs/cmp_mesh/jrt/jrtkdtreebuilder.cpp b/applications/_libs/cmp_mesh/jrt/jrtkdtreebuilder.cpp index f4194924f..24a4dc528 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtkdtreebuilder.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrtkdtreebuilder.cpp @@ -3,12 +3,12 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTKDTreeBuilder.h" -#include "JRTKDTree.h" -#include "JRTMesh.h" -#include "JRTCoreUtils.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtkdtreebuilder.h" +#include "jrtkdtree.h" +#include "jrtmesh.h" +#include "jrtcoreutils.h" // diff --git a/applications/_libs/cmp_mesh/jrt/jrtkdtreebuilder.h b/applications/_libs/cmp_mesh/jrt/jrtkdtreebuilder.h index 5da69caf7..71718e03e 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtkdtreebuilder.h +++ b/applications/_libs/cmp_mesh/jrt/jrtkdtreebuilder.h @@ -6,7 +6,7 @@ #ifndef _JRT_KDTREE_BUILDER_H_ #define _JRT_KDTREE_BUILDER_H_ -#include "JRTCommon.h" +#include "jrtcommon.h" class JRTMesh; class JRTKDTree; diff --git a/applications/_libs/cmp_mesh/jrt/jrtmesh.cpp b/applications/_libs/cmp_mesh/jrt/jrtmesh.cpp index fd53c1913..d01859b57 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtmesh.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrtmesh.cpp @@ -3,10 +3,10 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTMesh.h" -#include "JRTBoundingBox.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtmesh.h" +#include "jrtboundingbox.h" /// A mesh must have an array of positions and connectivity. It may also have per-vertex normals /// If per-vertex normals are omitted, then per-face normals are used instead. diff --git a/applications/_libs/cmp_mesh/jrt/jrtmesh.h b/applications/_libs/cmp_mesh/jrt/jrtmesh.h index 4dae0d028..06e688426 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtmesh.h +++ b/applications/_libs/cmp_mesh/jrt/jrtmesh.h @@ -6,7 +6,7 @@ #ifndef _JRT_MESH_H_ #define _JRT_MESH_H_ -#include "JRTCommon.h" +#include "jrtcommon.h" class JRTTriangle; diff --git a/applications/_libs/cmp_mesh/jrt/jrtorthocamera.cpp b/applications/_libs/cmp_mesh/jrt/jrtorthocamera.cpp index 171baf0d2..469bb4234 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtorthocamera.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrtorthocamera.cpp @@ -3,10 +3,10 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "JRTCommon.h" -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTOrthoCamera.h" +#include "jrtcommon.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtorthocamera.h" JRTOrthoCamera::JRTOrthoCamera(const Vec3f& rPosition, const Vec3f& rDirection, const Vec3f& rUp, float fHorizontalSize) : m_position(rPosition), m_direction(rDirection), m_fSize(fHorizontalSize), m_fAspect(1) { diff --git a/applications/_libs/cmp_mesh/jrt/jrtorthocamera.h b/applications/_libs/cmp_mesh/jrt/jrtorthocamera.h index da128ca5d..c06408945 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtorthocamera.h +++ b/applications/_libs/cmp_mesh/jrt/jrtorthocamera.h @@ -6,7 +6,7 @@ #ifndef _JRT_ORTHO_CAMERA_H_ #define _JRT_ORTHO_CAMERA_H_ -#include "JRTCamera.h" +#include "jrtcamera.h" class JRTOrthoCamera : public JRTCamera { diff --git a/applications/_libs/cmp_mesh/jrt/jrtppmimage.cpp b/applications/_libs/cmp_mesh/jrt/jrtppmimage.cpp index 281674432..60c2a63fc 100644 --- a/applications/_libs/cmp_mesh/jrt/jrtppmimage.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrtppmimage.cpp @@ -3,9 +3,9 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTPPMImage.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtppmimage.h" /********************************************************/ diff --git a/applications/_libs/cmp_mesh/jrt/jrttriangleintersection.cpp b/applications/_libs/cmp_mesh/jrt/jrttriangleintersection.cpp index f464839e0..e1737c6ff 100644 --- a/applications/_libs/cmp_mesh/jrt/jrttriangleintersection.cpp +++ b/applications/_libs/cmp_mesh/jrt/jrttriangleintersection.cpp @@ -3,12 +3,12 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "JRTCoreUtils.h" -#include "JRTTriangleIntersection.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "jrtcoreutils.h" +#include "jrttriangleintersection.h" -#include "JMLSSEVec.h" +#include "jmlssevec.h" #include #include #include diff --git a/applications/_libs/cmp_mesh/jrt/jrttriangleintersection.h b/applications/_libs/cmp_mesh/jrt/jrttriangleintersection.h index ce6f852ae..790d409a7 100644 --- a/applications/_libs/cmp_mesh/jrt/jrttriangleintersection.h +++ b/applications/_libs/cmp_mesh/jrt/jrttriangleintersection.h @@ -6,7 +6,7 @@ #ifndef _JRT_TRIANGLE_INTERSECTION_H_ #define _JRT_TRIANGLE_INTERSECTION_H_ -#include "JRTCommon.h" +#include "jrtcommon.h" // Note to self: P4 cache lines: 64 bytes diff --git a/applications/_libs/cmp_mesh/mesh.h b/applications/_libs/cmp_mesh/mesh.h index e26536313..469e2abbe 100644 --- a/applications/_libs/cmp_mesh/mesh.h +++ b/applications/_libs/cmp_mesh/mesh.h @@ -7,7 +7,7 @@ #define MESH_H #include "soup.h" -#include "Timer.h" +#include "timer.h" #include "error.h" typedef std::vector< std::vector > VTArray; diff --git a/applications/_libs/cmp_mesh/overdraw.cpp b/applications/_libs/cmp_mesh/overdraw.cpp index 93afc1ac9..9911378a8 100644 --- a/applications/_libs/cmp_mesh/overdraw.cpp +++ b/applications/_libs/cmp_mesh/overdraw.cpp @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" +#include "tootlepch.h" #include "overdraw.h" #include "soup.h" @@ -17,7 +17,7 @@ #include "gdiwm.h" #endif -#include "TootleRaytracer.h" +#include "tootleraytracer.h" //================================================================================================================================= // diff --git a/applications/_libs/cmp_mesh/soup.cpp b/applications/_libs/cmp_mesh/soup.cpp index 37da87a45..baab78d29 100644 --- a/applications/_libs/cmp_mesh/soup.cpp +++ b/applications/_libs/cmp_mesh/soup.cpp @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" +#include "tootlepch.h" #include #include "soup.h" #include "error.h" diff --git a/applications/_libs/cmp_mesh/souptomesh.cpp b/applications/_libs/cmp_mesh/souptomesh.cpp index 308ec9c3a..c19942141 100644 --- a/applications/_libs/cmp_mesh/souptomesh.cpp +++ b/applications/_libs/cmp_mesh/souptomesh.cpp @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" +#include "tootlepch.h" #include "souptomesh.h" int SoupToMesh(Soup* soup, Mesh* mesh) { diff --git a/applications/_libs/cmp_mesh/stripifier.cpp b/applications/_libs/cmp_mesh/stripifier.cpp index 1627a7037..5762581b7 100644 --- a/applications/_libs/cmp_mesh/stripifier.cpp +++ b/applications/_libs/cmp_mesh/stripifier.cpp @@ -9,7 +9,7 @@ // Includes / defines / typedefs / static member variable initialization block // //================================================================================================================================= -#include "Stripifier.h" +#include "stripifier.h" static const int START = 0; static const int LEFT = 1; diff --git a/applications/_libs/cmp_mesh/stripifier.h b/applications/_libs/cmp_mesh/stripifier.h index 9e93965f0..d74effc4b 100644 --- a/applications/_libs/cmp_mesh/stripifier.h +++ b/applications/_libs/cmp_mesh/stripifier.h @@ -16,7 +16,7 @@ //#define _TIMING #ifdef _TIMING -#include +#include #define GetTime() GetTickCount() typedef DWORD _TIME; #endif diff --git a/applications/_libs/cmp_mesh/timer.cpp b/applications/_libs/cmp_mesh/timer.cpp index c6ed77567..2c555095c 100644 --- a/applications/_libs/cmp_mesh/timer.cpp +++ b/applications/_libs/cmp_mesh/timer.cpp @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" +#include "tootlepch.h" #ifdef _WIN32 #include #else @@ -11,7 +11,7 @@ #include #endif -#include "Timer.h" +#include "timer.h" Timer:: Timer() { diff --git a/applications/_libs/cmp_mesh/tootlelib.cpp b/applications/_libs/cmp_mesh/tootlelib.cpp index e70e15fca..dfad915db 100644 --- a/applications/_libs/cmp_mesh/tootlelib.cpp +++ b/applications/_libs/cmp_mesh/tootlelib.cpp @@ -4,7 +4,7 @@ /// \file ****************************************************************************************/ #include -#include "TootlePCH.h" +#include "tootlepch.h" #ifndef _WIN32 #define _SOFTWARE_ONLY_VERSION diff --git a/applications/_libs/cmp_mesh/tootleraytracer.cpp b/applications/_libs/cmp_mesh/tootleraytracer.cpp index 2d96a3aed..c99c4eb8d 100644 --- a/applications/_libs/cmp_mesh/tootleraytracer.cpp +++ b/applications/_libs/cmp_mesh/tootleraytracer.cpp @@ -7,16 +7,16 @@ // define this to make the raytracer dump out debugging images //#define DEBUG_IMAGES -#include "TootlePCH.h" -#include "JRTCommon.h" -#include "TootleRaytracer.h" -#include "JRTCore.h" -#include "JRTMesh.h" -#include "JRTOrthoCamera.h" -#include "JRTBoundingBox.h" +#include "tootlepch.h" +#include "jrtcommon.h" +#include "tootleraytracer.h" +#include "jrtcore.h" +#include "jrtmesh.h" +#include "jrtorthocamera.h" +#include "jrtboundingbox.h" #ifdef DEBUG_IMAGES -#include "JRTPPMImage.h" +#include "jrtppmimage.h" #endif // function defined by Tootle that is called to process ray hits for each pixel diff --git a/applications/_libs/cmp_meshcompressor/cmakelists.txt b/applications/_libs/cmp_meshcompressor/cmakelists.txt index 92490d088..49c718775 100644 --- a/applications/_libs/cmp_meshcompressor/cmakelists.txt +++ b/applications/_libs/cmp_meshcompressor/cmakelists.txt @@ -2,8 +2,8 @@ add_library(CMP_MeshCompressor) file(GLOB_RECURSE DRACO_SRC - Draco/*.h - Draco/*.cc + draco/*.h + draco/*.cc ) target_sources(CMP_MeshCompressor PRIVATE @@ -11,7 +11,7 @@ target_sources(CMP_MeshCompressor PRIVATE ) target_include_directories(CMP_MeshCompressor PUBLIC - ./Draco/src/ + ./draco/src/ ./ ) diff --git a/applications/_libs/gpu_decode/cmakelists.txt b/applications/_libs/gpu_decode/cmakelists.txt index 3285d2861..b4338f6fc 100644 --- a/applications/_libs/gpu_decode/cmakelists.txt +++ b/applications/_libs/gpu_decode/cmakelists.txt @@ -3,18 +3,18 @@ add_library(GPU_Decode) target_sources(GPU_Decode PRIVATE - GPU_Decode.cpp - GPU_Decode.h - GPU_DecodeBase.cpp - GPU_DecodeBase.h + gpu_decode.cpp + gpu_decode.h + gpu_decodebase.cpp + gpu_decodebase.h ) target_include_directories(GPU_Decode PUBLIC ./ - ${PROJECT_SOURCE_DIR}/CMP_CompressonatorLib - ${PROJECT_SOURCE_DIR}/CMP_Framework/Common - ${PROJECT_SOURCE_DIR}/CMP_Framework/Common/half + ${PROJECT_SOURCE_DIR}/cmp_compressonatorlib + ${PROJECT_SOURCE_DIR}/cmp_framework/common + ${PROJECT_SOURCE_DIR}/cmp_framework/common/half ) target_link_libraries(GPU_Decode diff --git a/applications/_libs/gpu_decode/gpu_decode.cpp b/applications/_libs/gpu_decode/gpu_decode.cpp index 70ffb8bc8..c00235782 100644 --- a/applications/_libs/gpu_decode/gpu_decode.cpp +++ b/applications/_libs/gpu_decode/gpu_decode.cpp @@ -25,11 +25,11 @@ //===================================================================== #ifdef _WIN32 -#include "GPU_DecodeBase.h" -#include "GPU_Decode.h" -#include "PluginInterface.h" +#include "gpu_decodebase.h" +#include "gpu_decode.h" +#include "plugininterface.h" -#include +#include extern PluginManager g_pluginManager; diff --git a/applications/_libs/gpu_decode/gpu_decode.h b/applications/_libs/gpu_decode/gpu_decode.h index 306088417..a555839a5 100644 --- a/applications/_libs/gpu_decode/gpu_decode.h +++ b/applications/_libs/gpu_decode/gpu_decode.h @@ -26,7 +26,7 @@ // //===================================================================== -#include "Compressonator.h" +#include "compressonator.h" #ifdef __cplusplus extern "C" { diff --git a/applications/_libs/gpu_decode/gpu_decodebase.cpp b/applications/_libs/gpu_decode/gpu_decodebase.cpp index 6a8456080..5246786e9 100644 --- a/applications/_libs/gpu_decode/gpu_decodebase.cpp +++ b/applications/_libs/gpu_decode/gpu_decodebase.cpp @@ -26,9 +26,9 @@ #ifdef _WIN32 #ifndef DISABLE_TESTCODE -#include "Common.h" -#include "Compressonator.h" -#include "GPU_DecodeBase.h" +#include "common.h" +#include "compressonator.h" +#include "gpu_decodebase.h" using namespace GPU_Decode; diff --git a/applications/_libs/gpu_decode/gpu_decodebase.h b/applications/_libs/gpu_decode/gpu_decodebase.h index 888a40305..4ba6af002 100644 --- a/applications/_libs/gpu_decode/gpu_decodebase.h +++ b/applications/_libs/gpu_decode/gpu_decodebase.h @@ -28,8 +28,8 @@ #ifdef _WIN32 #ifndef DISABLE_TESTCODE -#include "Compressonator.h" -#include +#include "compressonator.h" +#include //uncomment to show image on console window for debug //#define SHOW_WINDOW diff --git a/applications/_plugins/atiformats/cmakelists.txt b/applications/_plugins/atiformats/cmakelists.txt index 5ce1a0799..0f617b0ef 100644 --- a/applications/_plugins/atiformats/cmakelists.txt +++ b/applications/_plugins/atiformats/cmakelists.txt @@ -3,12 +3,12 @@ add_library(Plugin_Common_ATIFormats) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../Common) +set(LEGACY_LOCATION ../common) target_sources(Plugin_Common_ATIFormats PRIVATE - ${LEGACY_LOCATION}/ATIFormats.cpp - ${LEGACY_LOCATION}/ATIFormats.h + ${LEGACY_LOCATION}/atiformats.cpp + ${LEGACY_LOCATION}/atiformats.h ) target_include_directories(Plugin_Common_ATIFormats PUBLIC diff --git a/applications/_plugins/c3dmodel_loaders/cmakelists.txt b/applications/_plugins/c3dmodel_loaders/cmakelists.txt index 6eded2a6d..d461c7c4b 100644 --- a/applications/_plugins/c3dmodel_loaders/cmakelists.txt +++ b/applications/_plugins/c3dmodel_loaders/cmakelists.txt @@ -3,7 +3,7 @@ add_library(Plugin_C3DModel_Loaders INTERFACE) if (CMP_HOST_WINDOWS) add_subdirectory(drc) - add_subdirectory(glTF_20) + add_subdirectory(gltf_20) add_subdirectory(obj) target_link_libraries(Plugin_C3DModel_Loaders INTERFACE diff --git a/applications/_plugins/c3dmodel_loaders/drc/cmakelists.txt b/applications/_plugins/c3dmodel_loaders/drc/cmakelists.txt index 3cd181d20..77fc9c98e 100644 --- a/applications/_plugins/c3dmodel_loaders/drc/cmakelists.txt +++ b/applications/_plugins/c3dmodel_loaders/drc/cmakelists.txt @@ -3,8 +3,8 @@ add_library(Plugin_C3DModel_Loaders_drc) target_sources(Plugin_C3DModel_Loaders_drc PRIVATE - ModelLoader_drc.cpp - ModelLoader_drc.h + modelloader_drc.cpp + modelloader_drc.h ) target_link_libraries(Plugin_C3DModel_Loaders_drc PRIVATE @@ -18,7 +18,7 @@ target_link_libraries(Plugin_C3DModel_Loaders_drc PRIVATE ) # Find the QtWidgets library -find_package(Qt5 REQUIRED COMPONENTS Core Widgets) +find_package(Qt5 REQUIRED COMPONENTS Core Widgets HINTS ${QT_PACKAGE_ROOT}) target_include_directories(Plugin_C3DModel_Loaders_drc PUBLIC ./ diff --git a/applications/_plugins/c3dmodel_loaders/drc/modelloader_drc.cpp b/applications/_plugins/c3dmodel_loaders/drc/modelloader_drc.cpp index 66622fd60..5d4d0b3dd 100644 --- a/applications/_plugins/c3dmodel_loaders/drc/modelloader_drc.cpp +++ b/applications/_plugins/c3dmodel_loaders/drc/modelloader_drc.cpp @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team //============================================================================= -#include "ModelLoader_drc.h" +#include "modelloader_drc.h" #include diff --git a/applications/_plugins/c3dmodel_loaders/drc/modelloader_drc.h b/applications/_plugins/c3dmodel_loaders/drc/modelloader_drc.h index 95b2d6361..f7e3ed7c8 100644 --- a/applications/_plugins/c3dmodel_loaders/drc/modelloader_drc.h +++ b/applications/_plugins/c3dmodel_loaders/drc/modelloader_drc.h @@ -23,10 +23,10 @@ #include "draco/core/cycle_timer.h" #pragma warning( pop ) -#include "Compressonator.h" -#include "PluginInterface.h" +#include "compressonator.h" +#include "plugininterface.h" -#include "ModelData.h" +#include "modeldata.h" #define TC_PLUGIN_VERSION_MAJOR 1 #define TC_PLUGIN_VERSION_MINOR 0 diff --git a/applications/_plugins/c3dmodel_loaders/gltf_20/cmakelists.txt b/applications/_plugins/c3dmodel_loaders/gltf_20/cmakelists.txt index 2b003eab1..06fbb7a68 100644 --- a/applications/_plugins/c3dmodel_loaders/gltf_20/cmakelists.txt +++ b/applications/_plugins/c3dmodel_loaders/gltf_20/cmakelists.txt @@ -2,8 +2,8 @@ add_library(Plugin_C3DModel_Loaders_glTF_20) target_sources(Plugin_C3DModel_Loaders_glTF_20 PRIVATE - glTF_20.cpp - glTF_20.h + gltf_20.cpp + gltf_20.h ) target_link_libraries(Plugin_C3DModel_Loaders_glTF_20 PRIVATE @@ -18,7 +18,7 @@ target_link_libraries(Plugin_C3DModel_Loaders_glTF_20 PRIVATE Plugin_TCPluginAPI ) -find_package(Qt5 REQUIRED COMPONENTS Core Widgets) +find_package(Qt5 REQUIRED COMPONENTS Core Widgets HINTS ${QT_PACKAGE_ROOT}) target_include_directories(Plugin_C3DModel_Loaders_glTF_20 PUBLIC ${PROJECT_SOURCE_DIR}/../common/lib/ext/glm/ diff --git a/applications/_plugins/c3dmodel_loaders/gltf_20/gltf_20.cpp b/applications/_plugins/c3dmodel_loaders/gltf_20/gltf_20.cpp index 17e9608be..4aa08af05 100644 --- a/applications/_plugins/c3dmodel_loaders/gltf_20/gltf_20.cpp +++ b/applications/_plugins/c3dmodel_loaders/gltf_20/gltf_20.cpp @@ -21,15 +21,15 @@ // THE SOFTWARE. // -#include "glTF_20.h" +#include "gltf_20.h" #include #include #include -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" #include #include @@ -44,7 +44,7 @@ void *make_Plugin_glTF_Loader() { } #endif -#include "Misc.h" +#include "misc.h" #ifdef USE_TINYGLTF2 #include "tiny_gltf2_utils.h" diff --git a/applications/_plugins/c3dmodel_loaders/gltf_20/gltf_20.h b/applications/_plugins/c3dmodel_loaders/gltf_20/gltf_20.h index 56ce30dac..05fcefc4f 100644 --- a/applications/_plugins/c3dmodel_loaders/gltf_20/gltf_20.h +++ b/applications/_plugins/c3dmodel_loaders/gltf_20/gltf_20.h @@ -25,8 +25,8 @@ #define _PLUGIN_IMAGE_BMP_H -#include "PluginInterface.h" -#include "GltfCommon.h" +#include "plugininterface.h" +#include "gltfcommon.h" #ifdef _WIN32 // {2505D1C0-D0F3-4E57-BCED-8358689D3FCC} diff --git a/applications/_plugins/c3dmodel_loaders/obj/meshobjloader.cpp b/applications/_plugins/c3dmodel_loaders/obj/meshobjloader.cpp index bb202c40b..bce5bb534 100644 --- a/applications/_plugins/c3dmodel_loaders/obj/meshobjloader.cpp +++ b/applications/_plugins/c3dmodel_loaders/obj/meshobjloader.cpp @@ -34,7 +34,7 @@ #endif -#include "MeshObjLoader.h" +#include "meshobjloader.h" #include #include #include diff --git a/applications/_plugins/c3dmodel_loaders/obj/meshobjloader.h b/applications/_plugins/c3dmodel_loaders/obj/meshobjloader.h index 47b092e94..fc86c1723 100644 --- a/applications/_plugins/c3dmodel_loaders/obj/meshobjloader.h +++ b/applications/_plugins/c3dmodel_loaders/obj/meshobjloader.h @@ -28,7 +28,7 @@ #include #include -#include "ModelData.h" +#include "modeldata.h" //================================================================================================================================= /// \brief An OBJ file loader diff --git a/applications/_plugins/c3dmodel_loaders/obj/obj_10.cpp b/applications/_plugins/c3dmodel_loaders/obj/obj_10.cpp index 3c1a3d886..87c5aef74 100644 --- a/applications/_plugins/c3dmodel_loaders/obj/obj_10.cpp +++ b/applications/_plugins/c3dmodel_loaders/obj/obj_10.cpp @@ -30,11 +30,11 @@ #include #include #include -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" -#include "Compressonator.h" -#include "UtilFuncs.h" +#include "compressonator.h" +#include "utilfuncs.h" #include #include @@ -55,7 +55,7 @@ void *make_Plugin_obj_Loader() { } #endif -#include "Misc.h" +#include "misc.h" #ifdef BUILD_AS_PLUGIN_DLL bool g_bAbortCompression = false; diff --git a/applications/_plugins/c3dmodel_loaders/obj/obj_10.h b/applications/_plugins/c3dmodel_loaders/obj/obj_10.h index b76d6cfe0..5a2b48beb 100644 --- a/applications/_plugins/c3dmodel_loaders/obj/obj_10.h +++ b/applications/_plugins/c3dmodel_loaders/obj/obj_10.h @@ -24,9 +24,9 @@ #define _PLUGIN_IMAGE_OBJ10_H -#include "PluginInterface.h" -#include "MeshObjLoader.h" -#include "ModelData.h" +#include "plugininterface.h" +#include "meshobjloader.h" +#include "modeldata.h" #ifdef _WIN32 // {73376578-3ABB-4F03-A595-95C8552DDFB1} diff --git a/applications/_plugins/c3dmodel_loaders/obj/objloader.cpp b/applications/_plugins/c3dmodel_loaders/obj/objloader.cpp index d53bc6e68..e4ce13de8 100644 --- a/applications/_plugins/c3dmodel_loaders/obj/objloader.cpp +++ b/applications/_plugins/c3dmodel_loaders/obj/objloader.cpp @@ -34,7 +34,7 @@ #endif -#include "ObjLoader.h" +#include "objloader.h" #include #include #include diff --git a/applications/_plugins/c3dmodel_loaders/obj/objloader.h b/applications/_plugins/c3dmodel_loaders/obj/objloader.h index d5d85864b..881b0fe55 100644 --- a/applications/_plugins/c3dmodel_loaders/obj/objloader.h +++ b/applications/_plugins/c3dmodel_loaders/obj/objloader.h @@ -27,7 +27,7 @@ #include #include -#include "ModelData.h" +#include "modeldata.h" //================================================================================================================================= /// \brief An OBJ file loader diff --git a/applications/_plugins/c3dmodel_viewers/cmakelists.txt b/applications/_plugins/c3dmodel_viewers/cmakelists.txt index 2480be634..84cab2132 100644 --- a/applications/_plugins/c3dmodel_viewers/cmakelists.txt +++ b/applications/_plugins/c3dmodel_viewers/cmakelists.txt @@ -2,23 +2,25 @@ add_library(Plugin_C3DModel_Viewers INTERFACE) if (OPTION_CMP_DIRECTX) - add_subdirectory(glTF_DX12_EX) + add_subdirectory(gltf_dx12_ex) target_link_libraries(Plugin_C3DModel_Viewers INTERFACE Plugin_C3DModel_Viewers_glTF_DX12_EX ) endif() +if (CMP_HOST_WINDOWS) if (OPTION_CMP_OPENGL) - add_subdirectory(glTF_OpenGL) + add_subdirectory(gltf_opengl) target_link_libraries(Plugin_C3DModel_Viewers INTERFACE Plugin_C3DModel_Viewers_glTF_OpenGL ) endif() +endif() if (OPTION_CMP_VULKAN) - add_subdirectory(Vulkan) + add_subdirectory(vulkan) target_link_libraries(Plugin_C3DModel_Viewers INTERFACE Plugin_C3DModel_Viewers_Vulkan diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/cmakelists.txt b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/cmakelists.txt index 195167390..7c66daea0 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/cmakelists.txt +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/cmakelists.txt @@ -14,7 +14,7 @@ target_include_directories(Plugin_C3DModel_Viewers_glTF_DX12_EX PUBLIC ./ ./media - ./DX12Util + ./dx12util ) target_link_libraries(Plugin_C3DModel_Viewers_glTF_DX12_EX PRIVATE diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/bloom.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/bloom.cpp index e095d69d8..826e8e8a8 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/bloom.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/bloom.cpp @@ -18,13 +18,13 @@ // THE SOFTWARE. -#include "DynamicBufferRingDX12.h" -#include "StaticBufferPoolDX12.h" -#include "UploadHeapDX12.h" -#include "TextureDX12.h" -#include "PostProcPS.h" -#include "TextureDX12.h" -#include "Bloom.h" +#include "dynamicbufferringdx12.h" +#include "staticbufferpooldx12.h" +#include "uploadheapdx12.h" +#include "texturedx12.h" +#include "postprocps.h" +#include "texturedx12.h" +#include "bloom.h" void Bloom::OnCreate( diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/bloom.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/bloom.h index b9b491712..e60f6288d 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/bloom.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/bloom.h @@ -18,7 +18,7 @@ // THE SOFTWARE. #pragma once -#include "PostProcPS.h" +#include "postprocps.h" #define BLOOM_DEPTH 6 diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/blurps.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/blurps.cpp index 8eed8fe67..a5c61bfcc 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/blurps.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/blurps.cpp @@ -17,14 +17,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "DynamicBufferRingDX12.h" -#include "StaticBufferPoolDX12.h" -#include "UploadHeapDX12.h" -#include "TextureDX12.h" -#include "PostProcPS.h" -#include "BlurPS.h" - -#include +#include "dynamicbufferringdx12.h" +#include "staticbufferpooldx12.h" +#include "uploadheapdx12.h" +#include "texturedx12.h" +#include "postprocps.h" +#include "blurps.h" + +#include using namespace DirectX; diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/blurps.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/blurps.h index f8c6b51d3..47a5c8cb9 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/blurps.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/blurps.h @@ -18,7 +18,7 @@ // THE SOFTWARE. #pragma once -#include "PostProcPS.h" +#include "postprocps.h" class BlurPS { public: diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/camera.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/camera.cpp index 458268335..7ac3d05bf 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/camera.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/camera.cpp @@ -17,9 +17,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "Camera.h" +#include "camera.h" -#include +#include #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/camera.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/camera.h index 9453cfec3..1961f71cf 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/camera.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/camera.h @@ -19,7 +19,7 @@ #pragma once -#include +#include #include // typical camera class diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/commandlistringdx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/commandlistringdx12.cpp index bb4a09e23..6de25d0aa 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/commandlistringdx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/commandlistringdx12.cpp @@ -17,9 +17,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "CommandListRingDX12.h" +#include "commandlistringdx12.h" -#include +#include //-------------------------------------------------------------------------------------- diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/commandlistringdx12.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/commandlistringdx12.h index 7648e08cd..a2c5d0cbc 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/commandlistringdx12.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/commandlistringdx12.h @@ -18,10 +18,10 @@ // THE SOFTWARE. #pragma once -#include "Ring.h" +#include "ring.h" #include -#include +#include // This class, on creation allocates a number of command lists. Using a ring buffer // these commandLists are recycled when they are no longer used by the GPU. See the diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/drawcube.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/drawcube.cpp index fd6b68229..bc7315838 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/drawcube.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/drawcube.cpp @@ -21,9 +21,9 @@ // THE SOFTWARE. // -#include "DrawCube.h" +#include "drawcube.h" -#include +#include #include #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/drawcube.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/drawcube.h index 30e9500d7..9564813f9 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/drawcube.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/drawcube.h @@ -17,10 +17,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. #pragma once -#include "DynamicBufferRingDX12.h" -#include "StaticBufferPoolDX12.h" -#include "UploadHeapDX12.h" -#include "Camera.h" +#include "dynamicbufferringdx12.h" +#include "staticbufferpooldx12.h" +#include "uploadheapdx12.h" +#include "camera.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/dynamicbufferringdx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/dynamicbufferringdx12.cpp index 28ec2bf14..3c650c0ce 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/dynamicbufferringdx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/dynamicbufferringdx12.cpp @@ -17,10 +17,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "DynamicBufferRingDX12.h" -#include "Misc.h" +#include "dynamicbufferringdx12.h" +#include "misc.h" -#include +#include #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/dynamicbufferringdx12.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/dynamicbufferringdx12.h index 88af4b474..70b667286 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/dynamicbufferringdx12.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/dynamicbufferringdx12.h @@ -18,8 +18,8 @@ // THE SOFTWARE. #pragma once -#include "Ring.h" -#include "ResourceViewHeapsDX12.h" +#include "ring.h" +#include "resourceviewheapsdx12.h" // This class mimics the behaviour or the DX11 dynamic buffers. // It does so by suballocating memory from a huge buffer. The buffer is used in a ring fashion. diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/fencedx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/fencedx12.cpp index dbdf7dbfa..e8b92a2ff 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/fencedx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/fencedx12.cpp @@ -17,9 +17,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "FenceDX12.h" +#include "fencedx12.h" -#include +#include FenceDX12::FenceDX12() { m_hEvent = CreateEventEx(nullptr, FALSE, FALSE, EVENT_ALL_ACCESS); diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/frameworkwindows.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/frameworkwindows.cpp index 32a73684d..e8ccb3ca8 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/frameworkwindows.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/frameworkwindows.cpp @@ -18,7 +18,7 @@ // THE SOFTWARE. -#include "FrameworkWindows.h" +#include "frameworkwindows.h" // LRESULT CALLBACK WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/frameworkwindows.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/frameworkwindows.h index dd5fcf4df..4fd0ac9aa 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/frameworkwindows.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/frameworkwindows.h @@ -19,7 +19,7 @@ #pragma once -#include +#include // class FrameworkWindows // { diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/gputimestampsdx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/gputimestampsdx12.cpp index 502d6a722..41a8947c4 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/gputimestampsdx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/gputimestampsdx12.cpp @@ -18,9 +18,9 @@ // THE SOFTWARE. -#include "GPUTimestampsDX12.h" +#include "gputimestampsdx12.h" -#include +#include void GPUTimestampsDX12::OnCreate(ID3D12Device* pDevice, DWORD numberOfBackBuffers, UINT node, UINT nodemask) { diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/imguidx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/imguidx12.cpp index 40dcda92b..743fa0e64 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/imguidx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/imguidx12.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "ImguiDX12.h" +#include "imguidx12.h" // DirectX #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/imguidx12.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/imguidx12.h index 808cf6504..4e2206c82 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/imguidx12.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/imguidx12.h @@ -19,10 +19,10 @@ #pragma once -#include "ResourceViewHeapsDX12.h" -#include "DynamicBufferRingDX12.h" -#include "CommandListRingDX12.h" -#include "UploadHeapDX12.h" +#include "resourceviewheapsdx12.h" +#include "dynamicbufferringdx12.h" +#include "commandlistringdx12.h" +#include "uploadheapdx12.h" #include "imgui/imgui.h" diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/keyboardmouse.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/keyboardmouse.cpp index 99eaed598..ef28b4352 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/keyboardmouse.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/keyboardmouse.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "KeyboardMouse.h" +#include "keyboardmouse.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/keyboardmouse.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/keyboardmouse.h index 3712aa758..9ea1a63e2 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/keyboardmouse.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/keyboardmouse.h @@ -19,7 +19,7 @@ #pragma once -#include +#include #define KEY_WAS_DOWN_MASK 0x80 #define KEY_IS_DOWN_MASK 0x01 diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postproccs.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postproccs.cpp index ba8df6045..5a6eeea4c 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postproccs.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postproccs.cpp @@ -17,13 +17,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "DynamicBufferRingDX12.h" -#include "StaticBufferPoolDX12.h" -#include "UploadHeapDX12.h" -#include "TextureDX12.h" -#include "PostProcCS.h" +#include "dynamicbufferringdx12.h" +#include "staticbufferpooldx12.h" +#include "uploadheapdx12.h" +#include "texturedx12.h" +#include "postproccs.h" -#include +#include #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postprocps.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postprocps.cpp index 697cd4a4a..8d2a8187c 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postprocps.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postprocps.cpp @@ -17,14 +17,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "DynamicBufferRingDX12.h" -#include "StaticBufferPoolDX12.h" -#include "UploadHeapDX12.h" -#include "TextureDX12.h" +#include "dynamicbufferringdx12.h" +#include "staticbufferpooldx12.h" +#include "uploadheapdx12.h" +#include "texturedx12.h" #include "PostProcPS.h" -#include "ThreadPool.h" +#include "threadpool.h" -#include +#include #include #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postprocps.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postprocps.h index ee9a019b0..8ffece1a6 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postprocps.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/postprocps.h @@ -19,8 +19,8 @@ #pragma once -#include "ResourceViewHeapsDX12.h" -#include "StaticBufferPoolDX12.h" +#include "resourceviewheapsdx12.h" +#include "staticbufferpooldx12.h" #include #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/resourceviewheapsdx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/resourceviewheapsdx12.cpp index 15444daaa..20c7b329a 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/resourceviewheapsdx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/resourceviewheapsdx12.cpp @@ -17,10 +17,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "ResourceViewHeapsDX12.h" +#include "resourceviewheapsdx12.h" #include "misc.h" -#include +#include //-------------------------------------------------------------------------------------- // diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/ring.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/ring.cpp index 997f38613..de8ac25b7 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/ring.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/ring.cpp @@ -18,7 +18,7 @@ // THE SOFTWARE. -#include "Ring.h" +#include "ring.h" diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/ring.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/ring.h index d63a40c4c..b987eb5cb 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/ring.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/ring.h @@ -19,7 +19,7 @@ #pragma once -#include +#include #include // This is the typical ring buffer, it is used by resources that will be reused. diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/skydome.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/skydome.cpp index 5f5b167c6..0c79a7950 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/skydome.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/skydome.cpp @@ -20,11 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#include "DynamicBufferRingDX12.h" -#include "StaticBufferPoolDX12.h" -#include "UploadHeapDX12.h" -#include "TextureDX12.h" -#include "SkyDome.h" +#include "dynamicbufferringdx12.h" +#include "staticbufferpooldx12.h" +#include "uploadheapdx12.h" +#include "texturedx12.h" +#include "skydome.h" using namespace DirectX; diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/skydome.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/skydome.h index 6133e700b..af3956b47 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/skydome.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/skydome.h @@ -18,9 +18,9 @@ // THE SOFTWARE. #pragma once -#include "PostProcPS.h" +#include "postprocps.h" -#include +#include class SkyDome { public: diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticbufferpooldx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticbufferpooldx12.cpp index 5ac1032bf..b94a14632 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticbufferpooldx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticbufferpooldx12.cpp @@ -17,10 +17,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "StaticBufferPoolDX12.h" -#include "Misc.h" +#include "staticbufferpooldx12.h" +#include "misc.h" -#include +#include void StaticBufferPoolDX12::OnCreate(ID3D12Device* pDevice, DWORD totalMemSize, bool bUseVidMem, UINT node, UINT nodemask) { m_pDevice = pDevice; diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticbufferpooldx12.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticbufferpooldx12.h index 70594a368..d80010e4c 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticbufferpooldx12.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticbufferpooldx12.h @@ -19,7 +19,7 @@ #pragma once -#include +#include #include // Simulates DX11 style static buffers. For dynamic buffers please see 'DynamicBufferRingDX12.h' diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticconstantbufferpooldx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticconstantbufferpooldx12.cpp index 2130fa25a..0f046eaf5 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticconstantbufferpooldx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticconstantbufferpooldx12.cpp @@ -17,9 +17,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "StaticConstantBufferPoolDX12.h" +#include "staticconstantbufferpooldx12.h" -#include +#include #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticconstantbufferpooldx12.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticconstantbufferpooldx12.h index 5c047e937..969143ef6 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticconstantbufferpooldx12.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/staticconstantbufferpooldx12.h @@ -18,7 +18,7 @@ // THE SOFTWARE. #pragma once -#include "ResourceViewHeapsDX12.h" +#include "resourceviewheapsdx12.h" // Simulates DX11 style static buffers. For dynamic buffers please see 'DynamicBufferRingDX12.h' // diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/swapchaindx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/swapchaindx12.cpp index 1a50fe10f..7f12d59ff 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/swapchaindx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/swapchaindx12.cpp @@ -17,9 +17,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "SwapChainDX12.h" +#include "swapchaindx12.h" -#include +#include #pragma comment(lib, "dxgi.lib") diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/swapchaindx12.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/swapchaindx12.h index 2c1477dc1..03e832201 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/swapchaindx12.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/swapchaindx12.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include class SwapChainDX12 { diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/texturedx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/texturedx12.cpp index 396617a78..50f28a8aa 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/texturedx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/texturedx12.cpp @@ -24,16 +24,16 @@ // http://go.microsoft.com/fwlink/?LinkId=248929 -#include "GltfFeatures.h" -#include "TextureDX12.h" +#include "gltffeatures.h" +#include "texturedx12.h" #include "dxgi.h" #include #include #include #include #include -#include "Misc.h" -#include "UtilFuncs.h" +#include "misc.h" +#include "utilfuncs.h" //-------------------------------------------------------------------------------------- // Constructor of the Texture class diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/texturedx12.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/texturedx12.h index abf7ad8ac..285ba43f6 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/texturedx12.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/texturedx12.h @@ -25,16 +25,16 @@ #pragma once -#include "ResourceViewHeapsDX12.h" -#include "UploadHeapDX12.h" +#include "resourceviewheapsdx12.h" +#include "uploadheapdx12.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/threadpool.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/threadpool.cpp index c65d04ff0..50073efcc 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/threadpool.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/threadpool.cpp @@ -19,7 +19,7 @@ #pragma once -#include "ThreadPool.h" +#include "threadpool.h" static ThreadPool t; diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/tonemapping.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/tonemapping.cpp index f94ff3342..00784c0e0 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/tonemapping.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/tonemapping.cpp @@ -21,11 +21,11 @@ // THE SOFTWARE. // -#include "ToneMapping.h" +#include "tonemapping.h" -#include "DynamicBufferRingDX12.h" -#include "StaticBufferPoolDX12.h" -#include "UploadHeapDX12.h" +#include "dynamicbufferringdx12.h" +#include "staticbufferpooldx12.h" +#include "uploadheapdx12.h" void ToneMapping::OnCreate(ID3D12Device* pDevice, UINT node, DXGI_FORMAT outFormat, ResourceViewHeapsDX12 *pResourceViewHeaps, StaticBufferPoolDX12 *pStaticBufferPool, DynamicBufferRingDX12 *pDynamicBufferRing) { diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/tonemapping.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/tonemapping.h index 5490deef2..3f6af449d 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/tonemapping.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/tonemapping.h @@ -18,9 +18,9 @@ // THE SOFTWARE. #pragma once -#include "PostProcPS.h" +#include "postprocps.h" -#include "DynamicBufferRingDX12.h" +#include "dynamicbufferringdx12.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/uploadheapdx12.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/uploadheapdx12.cpp index fe52bbbae..d60aaed28 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/uploadheapdx12.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/dx12util/uploadheapdx12.cpp @@ -19,10 +19,10 @@ #include -#include "UploadHeapDX12.h" -#include "Misc.h" +#include "uploadheapdx12.h" +#include "misc.h" -#include +#include //-------------------------------------------------------------------------------------- diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12_ex.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12_ex.cpp index 91842272a..b1489a83d 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12_ex.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12_ex.cpp @@ -20,13 +20,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#include "glTF_DX12_EX.h" +#include "gltf_dx12_ex.h" #include #include -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" #include #include @@ -42,9 +42,9 @@ void *make_Plugin_glTF_DX12_EX() { #endif -#include "Misc.h" +#include "misc.h" #include "d3dx12/d3dx12.h" -#include "glTF_DX12DeviceEx.h" +#include "gltf_dx12deviceex.h" #ifdef BUILD_AS_PLUGIN_DLL diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12_ex.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12_ex.h index 77f0efc2f..756857560 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12_ex.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12_ex.h @@ -24,8 +24,8 @@ #define _PLUGIN_IMAGE_BMP_H -#include "PluginInterface.h" -#include "glTF_DX12DeviceEx.h" +#include "plugininterface.h" +#include "gltf_dx12deviceex.h" #ifdef _WIN32 diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12deviceex.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12deviceex.cpp index cd1bcba64..1744750c0 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12deviceex.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12deviceex.cpp @@ -18,19 +18,19 @@ // THE SOFTWARE. -#include "GltfFeatures.h" +#include "gltffeatures.h" -#include "glTF_DX12DeviceEx.h" +#include "gltf_dx12deviceex.h" -#include "GltfCommon.h" -#include "Misc.h" +#include "gltfcommon.h" +#include "misc.h" #ifdef ENABLE_RENDER_CODE -#include "glTF_DX12RendererEx.h" +#include "gltf_dx12rendererex.h" #endif -#include -#include +#include +#include using namespace DirectX; diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12deviceex.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12deviceex.h index 8bf7b6e61..803241c11 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12deviceex.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12deviceex.h @@ -21,18 +21,18 @@ #define ENABLE_RENDER_CODE -#include "GltfFeatures.h" -#include "FrameworkWindows.h" -#include "Camera.h" -#include "SwapChainDX12.h" +#include "gltffeatures.h" +#include "frameworkwindows.h" +#include "camera.h" +#include "swapchaindx12.h" -#include "glTF_DX12RendererEx.h" +#include "gltf_dx12rendererex.h" -#include +#include #include "imgui/imgui.h" -#include "UserInterface.h" -#include "PluginManager.h" +#include "userinterface.h" +#include "pluginmanager.h" #define MAX_NUM_OF_NODES 2 diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12rendererex.cpp b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12rendererex.cpp index 3dfea792b..b19d45876 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12rendererex.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12rendererex.cpp @@ -18,13 +18,13 @@ // THE SOFTWARE. -#include "Misc.h" -#include "GltfPbr.h" +#include "misc.h" +#include "gltfpbr.h" #include "bloom.h" -#include "ThreadPool.h" -#include "glTF_DX12RendererEx.h" +#include "threadpool.h" +#include "gltf_dx12rendererex.h" -#include +#include using namespace DirectX; diff --git a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12rendererex.h b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12rendererex.h index a4230918f..cd57549e0 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12rendererex.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/gltf_dx12rendererex.h @@ -20,32 +20,32 @@ #pragma once -#include - -#include "GltfFeatures.h" -#include "UploadHeapDX12.h" -#include "TextureDX12.h" -#include "DynamicBufferRingDX12.h" -#include "StaticBufferPoolDX12.h" -#include "StaticConstantBufferPoolDX12.h" -#include "CommandListRingDX12.h" -#include "FenceDX12.h" -#include "ResourceViewHeapsDX12.h" -#include "Camera.h" -#include "GPUTimestampsDX12.h" - -#include "DX12Util/ImguiDX12.h" +#include + +#include "gltffeatures.h" +#include "uploadheapdx12.h" +#include "texturedx12.h" +#include "dynamicbufferringdx12.h" +#include "staticbufferpooldx12.h" +#include "staticconstantbufferpooldx12.h" +#include "commandlistringdx12.h" +#include "fencedx12.h" +#include "resourceviewheapsdx12.h" +#include "camera.h" +#include "gputimestampsdx12.h" + +#include "dx12util/imguidx12.h" #include -#include - -#include "GltfPbr.h" -#include "GltfDepthPass.h" -#include "GltfBBoxPass.h" -#include "BlurPS.h" -#include "ToneMapping.h" -#include "Bloom.h" -#include "SkyDome.h" -#include "UserInterface.h" +#include + +#include "gltfpbr.h" +#include "gltfdepthpass.h" +#include "gltfbboxpass.h" +#include "blurps.h" +#include "tonemapping.h" +#include "bloom.h" +#include "skydome.h" +#include "userinterface.h" static const int cNumSwapBufs = 2; diff --git a/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_ogldevice.cpp b/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_ogldevice.cpp index 86c29a4f9..ec2c1f03b 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_ogldevice.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_ogldevice.cpp @@ -15,7 +15,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "glTF_OGLDevice.h" +#include "gltf_ogldevice.h" static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = reinterpret_cast(wglGetProcAddress("wglSwapIntervalEXT")); diff --git a/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_ogldevice.h b/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_ogldevice.h index 5e464a452..974a49a43 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_ogldevice.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_ogldevice.h @@ -18,14 +18,14 @@ #ifndef _GLTF_OGLDEVICE_H #define _GLTF_OGLDEVICE_H -#include "UserInterface.h" -#include "PluginManager.h" -#include "Compressonator.h" +#include "userinterface.h" +#include "pluginmanager.h" +#include "compressonator.h" #include "QtWidgets/qwidget.h" // -- Qt Open GL Support -#include +#include #include #include #include @@ -37,23 +37,20 @@ #include #include #include -#include +#include -#include +#include #include "imgui/imgui.h" -#include -#include - -#include "ModelData.h" -#include "Misc.h" +#include "modeldata.h" +#include "misc.h" #define MAX_NUM_OF_NODES 2 #include // Uses Native Window Context -#include "ImGui_OpenGLRenderer.h" +#include "imgui_openglrenderer.h" -#include "MeshData.h" +#include "meshdata.h" #include #include #include diff --git a/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_opengl.cpp b/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_opengl.cpp index 14f07ec16..e6fc79165 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_opengl.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_opengl.cpp @@ -20,13 +20,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#include "glTF_OpenGL.h" +#include "gltf_opengl.h" #include #include -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" #include #include @@ -41,7 +41,7 @@ void* make_Plugin_glTF_OpenGL() { } #endif -#include "glTF_OGLDevice.h" +#include "gltf_ogldevice.h" #ifdef BUILD_AS_PLUGIN_DLL bool g_bAbortCompression = false; diff --git a/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_opengl.h b/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_opengl.h index 48d077fb5..453743891 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_opengl.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_opengl/gltf_opengl.h @@ -24,8 +24,8 @@ #define _GLTF_OPENGL_H #define STB_IMAGE_IMPLEMENTATION -#include "PluginInterface.h" -#include "glTF_OGLDevice.h" +#include "plugininterface.h" +#include "gltf_ogldevice.h" #ifdef _WIN32 // {79436B32-C8E1-45C9-99E3-AAA56B076A05} diff --git a/applications/_plugins/c3dmodel_viewers/gltf_opengl/meshdata.cpp b/applications/_plugins/c3dmodel_viewers/gltf_opengl/meshdata.cpp index c2418cb26..41ce063c3 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_opengl/meshdata.cpp +++ b/applications/_plugins/c3dmodel_viewers/gltf_opengl/meshdata.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#include "MeshData.h" +#include "meshdata.h" #include MeshData::MeshData() { @@ -148,7 +148,7 @@ CMP_Mesh MeshData::optimize(const CMP_Mesh& mesh, int lod) { return result; } -#include "JML.h" +#include "jml.h" using namespace JML; void MeshData::calcNormals(CMP_Mesh& mesh) { diff --git a/applications/_plugins/c3dmodel_viewers/gltf_opengl/meshdata.h b/applications/_plugins/c3dmodel_viewers/gltf_opengl/meshdata.h index a00c97226..fe336e9fe 100644 --- a/applications/_plugins/c3dmodel_viewers/gltf_opengl/meshdata.h +++ b/applications/_plugins/c3dmodel_viewers/gltf_opengl/meshdata.h @@ -27,7 +27,7 @@ #include #include -#include "ModelData.h" +#include "modeldata.h" class MeshData { diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/cmakelists.txt b/applications/_plugins/c3dmodel_viewers/vulkan/cmakelists.txt index f8e6705bf..15545630e 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/cmakelists.txt +++ b/applications/_plugins/c3dmodel_viewers/vulkan/cmakelists.txt @@ -16,7 +16,7 @@ target_sources(Plugin_C3DModel_Viewers_Vulkan PRIVATE target_include_directories(Plugin_C3DModel_Viewers_Vulkan PUBLIC ./ - ./Util + ./util ) target_link_libraries(Plugin_C3DModel_Viewers_Vulkan diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/camera.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/camera.cpp index ee02e2f16..b45705652 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/camera.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/camera.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "Camera.h" +#include "camera.h" #include #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/commandlistringvk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/commandlistringvk.cpp index e5610a58c..4220ad25d 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/commandlistringvk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/commandlistringvk.cpp @@ -18,9 +18,9 @@ // THE SOFTWARE. -#include "CommandListRingVK.h" +#include "commandlistringvk.h" -#include "DeviceVK.h" +#include "devicevk.h" //-------------------------------------------------------------------------------------- // diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/commandlistringvk.h b/applications/_plugins/c3dmodel_viewers/vulkan/util/commandlistringvk.h index 8a91ec89a..165e04914 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/commandlistringvk.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/commandlistringvk.h @@ -18,7 +18,7 @@ // THE SOFTWARE. #pragma once -#include "Ring.h" +#include "ring.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/devicevk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/devicevk.cpp index 6eb0acc0c..cf0f36092 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/devicevk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/devicevk.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#include "DeviceVK.h" +#include "devicevk.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/dynamicbufferringvk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/dynamicbufferringvk.cpp index 0ea671093..adb48be63 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/dynamicbufferringvk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/dynamicbufferringvk.cpp @@ -17,8 +17,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "DynamicBufferRingVK.h" -#include "Misc.h" +#include "dynamicbufferringvk.h" +#include "misc.h" //-------------------------------------------------------------------------------------- // diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/dynamicbufferringvk.h b/applications/_plugins/c3dmodel_viewers/vulkan/util/dynamicbufferringvk.h index 62b9a3d00..39d4f31ec 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/dynamicbufferringvk.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/dynamicbufferringvk.h @@ -18,8 +18,8 @@ // THE SOFTWARE. #pragma once -#include "Ring.h" -#include "DeviceVK.h" +#include "ring.h" +#include "devicevk.h" // This class mimics the behaviour or the DX11 dynamic buffers. // It does so by suballocating memory from a huge buffer. The buffer is used in a ring fashion. diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/frameworkwindows.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/frameworkwindows.cpp index 3fe8c9b68..2677cb0a1 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/frameworkwindows.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/frameworkwindows.cpp @@ -18,7 +18,7 @@ // THE SOFTWARE. -#include "FrameworkWindows.h" +#include "frameworkwindows.h" // LRESULT CALLBACK WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/imguivk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/imguivk.cpp index 0e4c6136f..860044c99 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/imguivk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/imguivk.cpp @@ -18,8 +18,8 @@ // THE SOFTWARE. -#include "ShaderCompilerHelper.h" -#include "ImguiVK.h" +#include "shadercompilerhelper.h" +#include "imguivk.h" // Data static HWND g_hWnd = 0; diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/imguivk.h b/applications/_plugins/c3dmodel_viewers/vulkan/util/imguivk.h index 5c320c7f6..1a458eb5e 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/imguivk.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/imguivk.h @@ -19,9 +19,9 @@ #pragma once -#include "DynamicBufferRingVK.h" -#include "CommandListRingVK.h" -#include "UploadHeapVK.h" +#include "dynamicbufferringvk.h" +#include "commandlistringvk.h" +#include "uploadheapvk.h" #include "imgui/imgui.h" // This is the rendering backend for the excellent ImGUI library. diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/keyboardmouse.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/keyboardmouse.cpp index ecb3e1385..df13e1f8d 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/keyboardmouse.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/keyboardmouse.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "KeyboardMouse.h" +#include "keyboardmouse.h" static bool m_keyDown[256]; static int m_mouseButton; diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/resourceviewheapsvk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/resourceviewheapsvk.cpp index 15f60247c..4816754fb 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/resourceviewheapsvk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/resourceviewheapsvk.cpp @@ -19,8 +19,8 @@ #include -#include "DeviceVK.h" -#include "ResourceViewHeapsVK.h" +#include "devicevk.h" +#include "resourceviewheapsvk.h" #include "misc.h" #if 0 diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/ring.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/ring.cpp index 7d074ff65..e4815a6e6 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/ring.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/ring.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "Ring.h" +#include "ring.h" diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/ring.h b/applications/_plugins/c3dmodel_viewers/vulkan/util/ring.h index e7b62d149..b7eafbee5 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/ring.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/ring.h @@ -19,7 +19,7 @@ #pragma once -#include +#include #include #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/shadercompilerhelper.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/shadercompilerhelper.cpp index 856acf076..2ed1ffce8 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/shadercompilerhelper.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/shadercompilerhelper.cpp @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "ShaderCompilerHelper.h" +#include "shadercompilerhelper.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/staticbufferpoolvk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/staticbufferpoolvk.cpp index 3e242bdbd..ed8a06524 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/staticbufferpoolvk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/staticbufferpoolvk.cpp @@ -18,8 +18,8 @@ // THE SOFTWARE. -#include "StaticBufferPoolVK.h" -#include "Misc.h" +#include "staticbufferpoolvk.h" +#include "misc.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/staticbufferpoolvk.h b/applications/_plugins/c3dmodel_viewers/vulkan/util/staticbufferpoolvk.h index 1e1ab2bb6..dd8248269 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/staticbufferpoolvk.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/staticbufferpoolvk.h @@ -19,14 +19,14 @@ #pragma once -#include +#include // Simulates DX11 style static buffers. For dynamic buffers please see 'DynamicBufferRingDX12.h' // // This class allows suballocating small chuncks of memory from a huge buffer that is allocated on creation // This class is specialized in vertex buffers. // -#include "DeviceVK.h" +#include "devicevk.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/staticconstantbufferpoolvk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/staticconstantbufferpoolvk.cpp index 3d4f4f11d..55b6a04e7 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/staticconstantbufferpoolvk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/staticconstantbufferpoolvk.cpp @@ -18,7 +18,7 @@ // THE SOFTWARE. -#include "StaticConstantBufferPoolVK.h" +#include "staticconstantbufferpoolvk.h" #define ALIGN(a) ((a + 255) & ~255) diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/staticconstantbufferpoolvk.h b/applications/_plugins/c3dmodel_viewers/vulkan/util/staticconstantbufferpoolvk.h index be99f14f1..6f416cef4 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/staticconstantbufferpoolvk.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/staticconstantbufferpoolvk.h @@ -18,8 +18,8 @@ // THE SOFTWARE. #pragma once -#include "Ring.h" -#include "DeviceVK.h" +#include "ring.h" +#include "devicevk.h" // Simulates DX11 style static buffers. For dynamic buffers please see 'DynamicBufferRingDX12.h' // diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/swapchainvk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/swapchainvk.cpp index 3e9bee32c..502b89c8c 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/swapchainvk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/swapchainvk.cpp @@ -34,8 +34,8 @@ // limitations under the License. -#include "DeviceVK.h" -#include "SwapChainVK.h" +#include "devicevk.h" +#include "swapchainvk.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/swapchainvk.h b/applications/_plugins/c3dmodel_viewers/vulkan/util/swapchainvk.h index e5ea3cc4d..b5ec7d770 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/swapchainvk.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/swapchainvk.h @@ -18,7 +18,7 @@ // THE SOFTWARE. #pragma once -#include "DeviceVK.h" +#include "devicevk.h" #include #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/texturevk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/texturevk.cpp index f398cac62..445c115d0 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/texturevk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/texturevk.cpp @@ -23,10 +23,10 @@ // http://go.microsoft.com/fwlink/?LinkId=248926 // http://go.microsoft.com/fwlink/?LinkId=248929 -#include "TextureVK.h" -#include "GltfFeatures.h" -#include "Misc.h" -#include "UtilFuncs.h" +#include "texturevk.h" +#include "gltffeatures.h" +#include "misc.h" +#include "utilfuncs.h" #include "dxgi.h" #include #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/texturevk.h b/applications/_plugins/c3dmodel_viewers/vulkan/util/texturevk.h index e80ffda2a..c1c98a4ca 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/texturevk.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/texturevk.h @@ -25,17 +25,17 @@ #pragma once -#include "DeviceVK.h" -#include "UploadHeapVK.h" -#include "DXGIFormat.h" +#include "devicevk.h" +#include "uploadheapvk.h" +#include "dxgiformat.h" -#include "Compressonator.h" -#include "GPU_Decode.h" -#include "Texture.h" -#include "PluginInterface.h" -#include "TextureIO.h" +#include "compressonator.h" +#include "gpu_decode.h" +#include "texture.h" +#include "plugininterface.h" +#include "textureio.h" -#include "ModelTexture.h" +#include "modeltexture.h" #define ISBITMASK( r,g,b,a ) ( pixelFmt.bitMaskR == r && pixelFmt.bitMaskG == g && pixelFmt.bitMaskB == b && pixelFmt.bitMaskA == a ) diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/threadpool.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/threadpool.cpp index c65d04ff0..50073efcc 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/threadpool.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/threadpool.cpp @@ -19,7 +19,7 @@ #pragma once -#include "ThreadPool.h" +#include "threadpool.h" static ThreadPool t; diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/trianglevk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/trianglevk.cpp index f483a93c6..8637f188c 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/trianglevk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/trianglevk.cpp @@ -24,9 +24,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "TriangleVK.h" +#include "trianglevk.h" -#include "ShaderCompilerHelper.h" +#include "shadercompilerhelper.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/trianglevk.h b/applications/_plugins/c3dmodel_viewers/vulkan/util/trianglevk.h index e9cce168e..f66fc2501 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/trianglevk.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/trianglevk.h @@ -18,9 +18,9 @@ // THE SOFTWARE. #pragma once -#include "DeviceVK.h" -#include "DynamicBufferRingVK.h" -#include "StaticBufferPoolVK.h" +#include "devicevk.h" +#include "dynamicbufferringvk.h" +#include "staticbufferpoolvk.h" #include "camera.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/util/uploadheapvk.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/util/uploadheapvk.cpp index 76e6385e1..a5a427893 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/util/uploadheapvk.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/util/uploadheapvk.cpp @@ -35,9 +35,9 @@ #include -#include "DeviceVK.h" -#include "UploadHeapVK.h" -#include "Misc.h" +#include "devicevk.h" +#include "uploadheapvk.h" +#include "misc.h" //-------------------------------------------------------------------------------------- // diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_device.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_device.cpp index 9ca5b7a5c..c9c066d24 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_device.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_device.cpp @@ -24,12 +24,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "Vulkan_Device.h" -#include "GltfCommon.h" +#include "vulkan_device.h" +#include "gltfcommon.h" #include "ImguiVK.h" #include "KeyboardMouse.h" -#include "Misc.h" -#include "SwapChainVK.h" +#include "misc.h" +#include "swapchainvk.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_device.h b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_device.h index c2ad63c39..0e6d92ff7 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_device.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_device.h @@ -24,23 +24,23 @@ // #pragma comment(lib,"d3dcompiler.lib") // #pragma comment(lib, "D3D12.lib") -#include "GltfFeatures.h" -#include "FrameworkWindows.h" -#include "Camera.h" -#include "SwapChainVK.h" -#include "DeviceVK.h" +#include "gltffeatures.h" +#include "frameworkwindows.h" +#include "camera.h" +#include "swapchainvk.h" +#include "devicevk.h" #ifdef ENABLE_RENDER_CODE -#include "Vulkan_Renderer.h" +#include "vulkan_renderer.h" #endif -#include "UserInterface.h" -#include "PluginManager.h" +#include "userinterface.h" +#include "pluginmanager.h" #define MAX_NUM_OF_NODES 2 // -- Qt Support #ifdef USE_QT10 -#include +#include #endif diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_main.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_main.cpp index d9484b442..7d93603f7 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_main.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_main.cpp @@ -24,14 +24,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#include "Vulkan_main.h" +#include "vulkan_main.h" -#include "GltfCommon.h" +#include "gltfcommon.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" -#include "Compressonator.h" +#include "compressonator.h" #include #include @@ -48,8 +48,8 @@ void *make_Plugin_3DModelViewer_Vulkan() { } #endif -#include "Misc.h" -#include "Vulkan_Device.h" +#include "misc.h" +#include "vulkan_device.h" #ifdef BUILD_AS_PLUGIN_DLL bool g_bAbortCompression = false; diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_main.h b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_main.h index b3a199f4a..c01b33e90 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_main.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_main.h @@ -24,8 +24,8 @@ #define _PLUGIN_IMAGE_BMP_H -#include "PluginInterface.h" -#include "Vulkan_Device.h" +#include "plugininterface.h" +#include "vulkan_device.h" #include diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_renderer.cpp b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_renderer.cpp index 098c73dfc..7896abd42 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_renderer.cpp +++ b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_renderer.cpp @@ -24,12 +24,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "Vulkan_Renderer.h" -#include "GltfBBoxPassVK.h" -#include "GltfDepthPassVK.h" -#include "GltfPbrVK.h" -#include "Misc.h" -#include "SwapChainVK.h" +#include "vulkan_renderer.h" +#include "gltfbboxpassvk.h" +#include "gltfdepthpassvk.h" +#include "gltfpbrvk.h" +#include "misc.h" +#include "swapchainvk.h" #ifdef USE_QT10 diff --git a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_renderer.h b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_renderer.h index c6729e44d..1c3e38df2 100644 --- a/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_renderer.h +++ b/applications/_plugins/c3dmodel_viewers/vulkan/vulkan_renderer.h @@ -19,21 +19,21 @@ #pragma once -#include "Camera.h" -#include "DeviceVK.h" -#include "TextureVK.h" +#include "camera.h" +#include "devicevk.h" +#include "texturevk.h" -#include "CommandListRingVK.h" -#include "StaticBufferPoolVK.h" +#include "commandlistringvk.h" +#include "staticbufferpoolvk.h" -#include "ImguiVK.h" -#include "ResourceViewHeapsVK.h" -#include "TriangleVK.h" +#include "imguivk.h" +#include "resourceviewheapsvk.h" +#include "trianglevk.h" // -- Qt Support #ifdef USE_QT10 -#include -#include +#include +#include #endif // Forward declaration diff --git a/applications/_plugins/canalysis/analysis/canalysis.cpp b/applications/_plugins/canalysis/analysis/canalysis.cpp index 17cd4aab4..a303e9ccb 100644 --- a/applications/_plugins/canalysis/analysis/canalysis.cpp +++ b/applications/_plugins/canalysis/analysis/canalysis.cpp @@ -29,14 +29,14 @@ #include #endif -#include "CAnalysis.h" +#include "canalysis.h" -#include "PluginInterface.h" -#include "PluginManager.h" -#include "SSIM.h" -#include "TextureIO.h" +#include "plugininterface.h" +#include "pluginmanager.h" +#include "ssim.h" +#include "textureio.h" -#include "cpImageLoader.h" +#include "cpimageloader.h" #ifdef USE_OPENCV #include "cvmatandqimage.h" diff --git a/applications/_plugins/canalysis/analysis/canalysis.h b/applications/_plugins/canalysis/analysis/canalysis.h index 3a2f48db4..1379c108b 100644 --- a/applications/_plugins/canalysis/analysis/canalysis.h +++ b/applications/_plugins/canalysis/analysis/canalysis.h @@ -26,13 +26,13 @@ #define USE_OPENCV -#include "PluginManager.h" -#include "TC_PluginInternal.h" -#include "CMP_FileIO.h" +#include "pluginmanager.h" +#include "tc_plugininternal.h" +#include "cmp_fileio.h" -#include +#include -#include +#include #ifdef USE_OPENCV #include diff --git a/applications/_plugins/canalysis/cmakelists.txt b/applications/_plugins/canalysis/cmakelists.txt index 577af04af..273096672 100644 --- a/applications/_plugins/canalysis/cmakelists.txt +++ b/applications/_plugins/canalysis/cmakelists.txt @@ -2,29 +2,38 @@ add_library(Plugin_CAnalysis) -target_sources(Plugin_CAnalysis PRIVATE - Analysis/CAnalysis.cpp - Analysis/CAnalysis.h -) +target_sources(Plugin_CAnalysis PRIVATE + analysis/canalysis.cpp + analysis/canalysis.h + ${PROJECT_SOURCE_DIR}/applications/_plugins/common/ssim.h + ${PROJECT_SOURCE_DIR}/applications/_plugins/common/ssim.cpp + ${PROJECT_SOURCE_DIR}/applications/compressonatorgui/components/cpimageloader.h + ${PROJECT_SOURCE_DIR}/applications/compressonatorgui/components/cpimageloader.cpp + ${PROJECT_SOURCE_DIR}/applications/compressonatorgui/common/cvmatandqimage.h + ${PROJECT_SOURCE_DIR}/applications/compressonatorgui/common/cvmatandqimage.cpp +) target_include_directories(Plugin_CAnalysis PUBLIC - ./Analysis - ${PROJECT_SOURCE_DIR}/CMP_CompressonatorLib - ${PROJECT_SOURCE_DIR}/CMP_Framework/Common - ${PROJECT_SOURCE_DIR}/CMP_Framework/Common/half + ./analysis + ${PROJECT_SOURCE_DIR}/cmp_compressonatorlib + ${PROJECT_SOURCE_DIR}/cmp_framework/common + ${PROJECT_SOURCE_DIR}/cmp_framework/common/half + ${PROJECT_SOURCE_DIR}/applications/_plugins/common + ${PROJECT_SOURCE_DIR}/applications/compressonatorgui/common + ${PROJECT_SOURCE_DIR}/applications/compressonatorgui/components + ${PROJECT_SOURCE_DIR}/applications/_libs/gpu_decode + ${Qt5Gui_INCLUDE_DIRS} + ${OpenEXR_INCLUDE_DIRS} ) target_link_libraries(Plugin_CAnalysis PRIVATE - CMP_GUI CompressonatorLIB Plugin_TCPluginAPI Plugin_PluginManager - Plugin_Common_ATIFormats - GPU_Decode - Plugin_PSNR + Plugin_CImage_EXR ExtOpenCV ExtOpenEXR ExtRapidXML diff --git a/applications/_plugins/ccmp_encode/cmakelists.txt b/applications/_plugins/ccmp_encode/cmakelists.txt index f8ce5a260..7b2622650 100644 --- a/applications/_plugins/ccmp_encode/cmakelists.txt +++ b/applications/_plugins/ccmp_encode/cmakelists.txt @@ -3,17 +3,17 @@ add_library(Plugin_CCMP_Encode) target_sources(Plugin_CCMP_Encode PRIVATE - HPC/CCPU_HPC.cpp - HPC/CCPU_HPC.h - HPC/cmp_hpc.cpp - HPC/cmp_hpc.h - HPC/Compute_CPU_HPC.cpp - HPC/Compute_CPU_HPC.h + hpc/ccpu_hpc.cpp + hpc/ccpu_hpc.h + hpc/cmp_hpc.cpp + hpc/cmp_hpc.h + hpc/compute_cpu_hpc.cpp + hpc/compute_cpu_hpc.h ) target_include_directories(Plugin_CCMP_Encode PUBLIC ./ - ./HPC + ./hpc ) target_link_libraries(Plugin_CCMP_Encode PRIVATE diff --git a/applications/_plugins/ccmp_encode/hpc/ccpu_hpc.cpp b/applications/_plugins/ccmp_encode/hpc/ccpu_hpc.cpp index 2dac896be..7d4db4c5f 100644 --- a/applications/_plugins/ccmp_encode/hpc/ccpu_hpc.cpp +++ b/applications/_plugins/ccmp_encode/hpc/ccpu_hpc.cpp @@ -22,10 +22,10 @@ //===================================================================== #include #include -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" -#include "CCPU_HPC.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" +#include "ccpu_hpc.h" CMIPS *CMips = NULL; diff --git a/applications/_plugins/ccmp_encode/hpc/ccpu_hpc.h b/applications/_plugins/ccmp_encode/hpc/ccpu_hpc.h index aea5ac7b5..eedfba59f 100644 --- a/applications/_plugins/ccmp_encode/hpc/ccpu_hpc.h +++ b/applications/_plugins/ccmp_encode/hpc/ccpu_hpc.h @@ -31,10 +31,10 @@ #endif #include -#include "Compute_Base.h" -#include "Compute_CPU_HPC.h" -#include "Compressonator.h" -#include "PluginInterface.h" +#include "compute_base.h" +#include "compute_cpu_hpc.h" +#include "compressonator.h" +#include "plugininterface.h" #include "cmp_math_common.h" //#include "debug.h" diff --git a/applications/_plugins/ccmp_encode/hpc/cmp_hpc.h b/applications/_plugins/ccmp_encode/hpc/cmp_hpc.h index 05603db7b..07ef48759 100644 --- a/applications/_plugins/ccmp_encode/hpc/cmp_hpc.h +++ b/applications/_plugins/ccmp_encode/hpc/cmp_hpc.h @@ -21,7 +21,7 @@ #include #endif -#include "Common_Def.h" +#include "common_def.h" struct bc7_enc_settings { bool mode_selection[4]; diff --git a/applications/_plugins/ccmp_encode/hpc/compute_cpu_hpc.cpp b/applications/_plugins/ccmp_encode/hpc/compute_cpu_hpc.cpp index 204812406..d83405105 100644 --- a/applications/_plugins/ccmp_encode/hpc/compute_cpu_hpc.cpp +++ b/applications/_plugins/ccmp_encode/hpc/compute_cpu_hpc.cpp @@ -23,8 +23,8 @@ // //===================================================================== -#include "PluginInterface.h" -#include "CCPU_HPC.h" +#include "plugininterface.h" +#include "ccpu_hpc.h" #include #include diff --git a/applications/_plugins/ccmp_encode/hpc/compute_cpu_hpc.h b/applications/_plugins/ccmp_encode/hpc/compute_cpu_hpc.h index c0af0c278..4e1a71494 100644 --- a/applications/_plugins/ccmp_encode/hpc/compute_cpu_hpc.h +++ b/applications/_plugins/ccmp_encode/hpc/compute_cpu_hpc.h @@ -28,7 +28,7 @@ #define __CL_ENABLE_EXCEPTIONS -#include "Compressonator.h" +#include "compressonator.h" #include "query_timer.h" #include diff --git a/applications/_plugins/ccmp_sdk/bc1/bc1.cpp b/applications/_plugins/ccmp_sdk/bc1/bc1.cpp index 1083c5847..4acb1be3a 100644 --- a/applications/_plugins/ccmp_sdk/bc1/bc1.cpp +++ b/applications/_plugins/ccmp_sdk/bc1/bc1.cpp @@ -23,7 +23,7 @@ // //===================================================================== -#include "BC1.h" +#include "bc1.h" #ifdef USE_TIMERS #include "query_timer.h" @@ -32,8 +32,8 @@ //#define BUILD_AS_PLUGIN_DLL #ifdef USE_CONVECTION_KERNELS -#pragma comment(lib, "ConvectionKernels.lib") -#include "ConvectionKernels.h" +#pragma comment(lib, "convectionkernels.lib") +#include "convectionkernels.h" using namespace cvtt; #endif diff --git a/applications/_plugins/ccmp_sdk/bc1/bc1.h b/applications/_plugins/ccmp_sdk/bc1/bc1.h index 65e4e9d27..f7a32b3c6 100644 --- a/applications/_plugins/ccmp_sdk/bc1/bc1.h +++ b/applications/_plugins/ccmp_sdk/bc1/bc1.h @@ -26,10 +26,10 @@ #ifndef _PLUGIN_COMPUTE_BC1_H #define _PLUGIN_COMPUTE_BC1_H -#include "Common_Def.h" -#include "PluginInterface.h" -#include "BC1_Encode_kernel.h" -#include "HPC_Compress.h" // padline defs +#include "common_def.h" +#include "plugininterface.h" +#include "bc1_encode_kernel.h" +#include "hpc_compress.h" // padline defs #include "cmp_math_common.h" #ifdef _WIN32 diff --git a/applications/_plugins/ccmp_sdk/bc1/cmakelists.txt b/applications/_plugins/ccmp_sdk/bc1/cmakelists.txt index d5bc2b715..340f1af6a 100644 --- a/applications/_plugins/ccmp_sdk/bc1/cmakelists.txt +++ b/applications/_plugins/ccmp_sdk/bc1/cmakelists.txt @@ -1,6 +1,6 @@ target_sources(Plugin_CCMP_SDK PRIVATE - BC1.cpp - BC1.h + bc1.cpp + bc1.h ) diff --git a/applications/_plugins/ccmp_sdk/bc2/bc2.cpp b/applications/_plugins/ccmp_sdk/bc2/bc2.cpp index f6c022ad3..292137d82 100644 --- a/applications/_plugins/ccmp_sdk/bc2/bc2.cpp +++ b/applications/_plugins/ccmp_sdk/bc2/bc2.cpp @@ -23,7 +23,7 @@ // //===================================================================== -#include "BC2.h" +#include "bc2.h" #ifdef BUILD_AS_PLUGIN_DLL DECLARE_PLUGIN(Plugin_BC1) diff --git a/applications/_plugins/ccmp_sdk/bc2/bc2.h b/applications/_plugins/ccmp_sdk/bc2/bc2.h index 36f7f0b34..bdb1de25e 100644 --- a/applications/_plugins/ccmp_sdk/bc2/bc2.h +++ b/applications/_plugins/ccmp_sdk/bc2/bc2.h @@ -26,10 +26,10 @@ #ifndef _PLUGIN_COMPUTE_BC2_H #define _PLUGIN_COMPUTE_BC2_H -#include "Common_Def.h" -#include "PluginInterface.h" -#include "BC2_Encode_kernel.h" -#include "HPC_Compress.h" // padline defs +#include "common_def.h" +#include "plugininterface.h" +#include "bc2_encode_kernel.h" +#include "hpc_compress.h" // padline defs #include "cmp_math_common.h" #ifdef _WIN32 diff --git a/applications/_plugins/ccmp_sdk/bc2/cmakelists.txt b/applications/_plugins/ccmp_sdk/bc2/cmakelists.txt index 707ef5860..55f4fa468 100644 --- a/applications/_plugins/ccmp_sdk/bc2/cmakelists.txt +++ b/applications/_plugins/ccmp_sdk/bc2/cmakelists.txt @@ -1,6 +1,6 @@ target_sources(Plugin_CCMP_SDK PRIVATE - BC2.cpp - BC2.h + bc2.cpp + bc2.h ) diff --git a/applications/_plugins/ccmp_sdk/bc3/bc3.cpp b/applications/_plugins/ccmp_sdk/bc3/bc3.cpp index f4ef53297..437872944 100644 --- a/applications/_plugins/ccmp_sdk/bc3/bc3.cpp +++ b/applications/_plugins/ccmp_sdk/bc3/bc3.cpp @@ -22,7 +22,7 @@ /// \file BC3.cpp // //===================================================================== -#include "BC3.h" +#include "bc3.h" #ifdef BUILD_AS_PLUGIN_DLL DECLARE_PLUGIN(Plugin_BC3) diff --git a/applications/_plugins/ccmp_sdk/bc3/bc3.h b/applications/_plugins/ccmp_sdk/bc3/bc3.h index 5b6bad4fc..140b751fc 100644 --- a/applications/_plugins/ccmp_sdk/bc3/bc3.h +++ b/applications/_plugins/ccmp_sdk/bc3/bc3.h @@ -26,10 +26,10 @@ #ifndef _PLUGIN_COMPUTE_BC3_H #define _PLUGIN_COMPUTE_BC3_H -#include "Common_Def.h" -#include "PluginInterface.h" -#include "BC3_Encode_kernel.h" -#include "HPC_Compress.h" // padline defs +#include "common_def.h" +#include "plugininterface.h" +#include "bc3_encode_kernel.h" +#include "hpc_compress.h" // padline defs #include "cmp_math_common.h" #ifdef _WIN32 diff --git a/applications/_plugins/ccmp_sdk/bc3/cmakelists.txt b/applications/_plugins/ccmp_sdk/bc3/cmakelists.txt index efef3f974..f104d4f1d 100644 --- a/applications/_plugins/ccmp_sdk/bc3/cmakelists.txt +++ b/applications/_plugins/ccmp_sdk/bc3/cmakelists.txt @@ -1,6 +1,6 @@ target_sources(Plugin_CCMP_SDK PRIVATE - BC3.cpp - BC3.h + bc3.cpp + bc3.h ) diff --git a/applications/_plugins/ccmp_sdk/bc4/bc4.cpp b/applications/_plugins/ccmp_sdk/bc4/bc4.cpp index c15c1d5ca..8cfda4a70 100644 --- a/applications/_plugins/ccmp_sdk/bc4/bc4.cpp +++ b/applications/_plugins/ccmp_sdk/bc4/bc4.cpp @@ -23,7 +23,7 @@ // //===================================================================== -#include "BC4.h" +#include "bc4.h" #ifdef BUILD_AS_PLUGIN_DLL DECLARE_PLUGIN(Plugin_BC4) diff --git a/applications/_plugins/ccmp_sdk/bc4/bc4.h b/applications/_plugins/ccmp_sdk/bc4/bc4.h index f92dd6516..efdafd3fc 100644 --- a/applications/_plugins/ccmp_sdk/bc4/bc4.h +++ b/applications/_plugins/ccmp_sdk/bc4/bc4.h @@ -26,10 +26,10 @@ #ifndef _PLUGIN_COMPUTE_BC4_H #define _PLUGIN_COMPUTE_BC4_H -#include "Common_Def.h" -#include "PluginInterface.h" -#include "BC4_Encode_kernel.h" -#include "HPC_Compress.h" // padline defs +#include "common_def.h" +#include "plugininterface.h" +#include "bc4_encode_kernel.h" +#include "hpc_compress.h" // padline defs #include "cmp_math_common.h" #ifdef _WIN32 diff --git a/applications/_plugins/ccmp_sdk/bc4/cmakelists.txt b/applications/_plugins/ccmp_sdk/bc4/cmakelists.txt index da124a06a..4391f0163 100644 --- a/applications/_plugins/ccmp_sdk/bc4/cmakelists.txt +++ b/applications/_plugins/ccmp_sdk/bc4/cmakelists.txt @@ -1,6 +1,6 @@ target_sources(Plugin_CCMP_SDK PRIVATE - BC4.cpp - BC4.h + bc4.cpp + bc4.h ) diff --git a/applications/_plugins/ccmp_sdk/bc5/bc5.cpp b/applications/_plugins/ccmp_sdk/bc5/bc5.cpp index 8f880ea5d..eebcd5e06 100644 --- a/applications/_plugins/ccmp_sdk/bc5/bc5.cpp +++ b/applications/_plugins/ccmp_sdk/bc5/bc5.cpp @@ -23,11 +23,11 @@ // //===================================================================== -#include "BC5.h" +#include "bc5.h" #ifdef USE_CONVECTION_KERNELS #pragma comment(lib, "ConvectionKernels.lib") -#include "ConvectionKernels.h" +#include "convectionkernels.h" using namespace cvtt; #endif diff --git a/applications/_plugins/ccmp_sdk/bc5/bc5.h b/applications/_plugins/ccmp_sdk/bc5/bc5.h index 040c451e3..79bf579a1 100644 --- a/applications/_plugins/ccmp_sdk/bc5/bc5.h +++ b/applications/_plugins/ccmp_sdk/bc5/bc5.h @@ -26,10 +26,10 @@ #ifndef _PLUGIN_COMPUTE_BC5_H #define _PLUGIN_COMPUTE_BC5_H -#include "Common_Def.h" -#include "PluginInterface.h" -#include "BC5_Encode_kernel.h" -#include "HPC_Compress.h" // padline defs +#include "common_def.h" +#include "plugininterface.h" +#include "bc5_encode_kernel.h" +#include "hpc_compress.h" // padline defs #include "cmp_math_common.h" #ifdef _WIN32 diff --git a/applications/_plugins/ccmp_sdk/bc5/cmakelists.txt b/applications/_plugins/ccmp_sdk/bc5/cmakelists.txt index 4a2adc694..80429fe05 100644 --- a/applications/_plugins/ccmp_sdk/bc5/cmakelists.txt +++ b/applications/_plugins/ccmp_sdk/bc5/cmakelists.txt @@ -1,6 +1,6 @@ target_sources(Plugin_CCMP_SDK PRIVATE - BC5.cpp - BC5.h + bc5.cpp + bc5.h ) diff --git a/applications/_plugins/ccmp_sdk/bc6/bc6h.cpp b/applications/_plugins/ccmp_sdk/bc6/bc6h.cpp index 05f46b53e..e49d4b04f 100644 --- a/applications/_plugins/ccmp_sdk/bc6/bc6h.cpp +++ b/applications/_plugins/ccmp_sdk/bc6/bc6h.cpp @@ -23,7 +23,7 @@ // //===================================================================== -#include "BC6H.h" +#include "bc6h.h" #ifdef BUILD_AS_PLUGIN_DLL DECLARE_PLUGIN(Plugin_BC6H) diff --git a/applications/_plugins/ccmp_sdk/bc6/bc6h.h b/applications/_plugins/ccmp_sdk/bc6/bc6h.h index e107b6ab4..b3d41144c 100644 --- a/applications/_plugins/ccmp_sdk/bc6/bc6h.h +++ b/applications/_plugins/ccmp_sdk/bc6/bc6h.h @@ -26,10 +26,10 @@ #ifndef _PLUGIN_COMPUTE_BC6H_H #define _PLUGIN_COMPUTE_BC6H_H -#include "Common_Def.h" -#include "PluginInterface.h" -#include "BC6_Encode_kernel.h" -#include "HPC_Compress.h" // padline defs +#include "common_def.h" +#include "plugininterface.h" +#include "bc6_encode_kernel.h" +#include "hpc_compress.h" // padline defs #include "cmp_math_common.h" #pragma warning(push) diff --git a/applications/_plugins/ccmp_sdk/bc6/cmakelists.txt b/applications/_plugins/ccmp_sdk/bc6/cmakelists.txt index d0215c5fb..a559173db 100644 --- a/applications/_plugins/ccmp_sdk/bc6/cmakelists.txt +++ b/applications/_plugins/ccmp_sdk/bc6/cmakelists.txt @@ -1,6 +1,6 @@ target_sources(Plugin_CCMP_SDK PRIVATE - BC6H.cpp - BC6H.h + bc6h.cpp + bc6h.h ) diff --git a/applications/_plugins/ccmp_sdk/bc7/bc7.cpp b/applications/_plugins/ccmp_sdk/bc7/bc7.cpp index f80a6f195..c071cab01 100644 --- a/applications/_plugins/ccmp_sdk/bc7/bc7.cpp +++ b/applications/_plugins/ccmp_sdk/bc7/bc7.cpp @@ -24,7 +24,7 @@ //===================================================================== #include -#include "BC7.h" +#include "bc7.h" #ifdef BUILD_AS_PLUGIN_DLL DECLARE_PLUGIN(Plugin_BC7) diff --git a/applications/_plugins/ccmp_sdk/bc7/bc7.h b/applications/_plugins/ccmp_sdk/bc7/bc7.h index f2d8a7fa5..a879f76aa 100644 --- a/applications/_plugins/ccmp_sdk/bc7/bc7.h +++ b/applications/_plugins/ccmp_sdk/bc7/bc7.h @@ -26,10 +26,10 @@ #ifndef _PLUGIN_COMPUTE_BC7_H #define _PLUGIN_COMPUTE_BC7_H -#include "Common_Def.h" -#include "PluginInterface.h" -#include "BC7_Encode_kernel.h" -#include "HPC_Compress.h" // padline defs +#include "common_def.h" +#include "plugininterface.h" +#include "bc7_encode_kernel.h" +#include "hpc_compress.h" // padline defs #include "cmp_math_common.h" #ifdef _WIN32 diff --git a/applications/_plugins/ccmp_sdk/bc7/cmakelists.txt b/applications/_plugins/ccmp_sdk/bc7/cmakelists.txt index 51be60a76..f0fd4fdca 100644 --- a/applications/_plugins/ccmp_sdk/bc7/cmakelists.txt +++ b/applications/_plugins/ccmp_sdk/bc7/cmakelists.txt @@ -1,6 +1,6 @@ target_sources(Plugin_CCMP_SDK PRIVATE - BC7.cpp - BC7.h + bc7.cpp + bc7.h ) diff --git a/applications/_plugins/ccmp_sdk/cmakelists.txt b/applications/_plugins/ccmp_sdk/cmakelists.txt index d8148cc8d..d59293e67 100644 --- a/applications/_plugins/ccmp_sdk/cmakelists.txt +++ b/applications/_plugins/ccmp_sdk/cmakelists.txt @@ -1,13 +1,13 @@ add_library(Plugin_CCMP_SDK) -add_subdirectory(BC1) -add_subdirectory(BC2) -add_subdirectory(BC3) -add_subdirectory(BC4) -add_subdirectory(BC5) -add_subdirectory(BC6) -add_subdirectory(BC7) +add_subdirectory(bc1) +add_subdirectory(bc2) +add_subdirectory(bc3) +add_subdirectory(bc4) +add_subdirectory(bc5) +add_subdirectory(bc6) +add_subdirectory(bc7) target_include_directories(Plugin_CCMP_SDK PUBLIC ./ diff --git a/applications/_plugins/cfilter/boxfilter.cpp b/applications/_plugins/cfilter/boxfilter.cpp index 565a0ebf3..a3c748104 100644 --- a/applications/_plugins/cfilter/boxfilter.cpp +++ b/applications/_plugins/cfilter/boxfilter.cpp @@ -21,7 +21,7 @@ // THE SOFTWARE. // //============================================================================== -#include "BoxFilter.h" +#include "boxfilter.h" #define BUILD_AS_PLUGIN_DLL @@ -30,15 +30,15 @@ #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include #include #ifndef _WIN32 -#include "TextureIO.h" +#include "textureio.h" #endif #include @@ -255,7 +255,9 @@ int Plugin_BoxFilter::TC_PluginGetVersion(TC_PluginVersion* pPluginVersion) { } //nMinSize : The size in pixels used to determine how many mip levels to generate. Once all dimensions are less than or equal to nMinSize your mipper should generate no more mip levels. -int Plugin_BoxFilter::TC_GenerateMIPLevels(MipSet* pMipSet, CMP_CFilterParams* pCFilterParams) { +int Plugin_BoxFilter::TC_CFilter(MipSet* pMipSet, CMP_MipSet* pMipSetDst, CMP_CFilterParams* pCFilterParams) +{ + (pMipSetDst); assert(pMipSet); assert(pMipSet->m_nMipLevels); int result = CMP_OK; diff --git a/applications/_plugins/cfilter/boxfilter.h b/applications/_plugins/cfilter/boxfilter.h index 32b54879a..91f6bbbdc 100644 --- a/applications/_plugins/cfilter/boxfilter.h +++ b/applications/_plugins/cfilter/boxfilter.h @@ -25,12 +25,12 @@ #ifndef _PLUGIN_IMAGE_H #define _PLUGIN_IMAGE_H -#include "PluginInterface.h" +#include "plugininterface.h" #ifdef _WIN32 #include "d3d9.h" -#include "D3DXModule.h" -#include "D3D9Module.h" +#include "d3dxmodule.h" +#include "d3d9module.h" // {3AF62198-7326-48FA-B1FB-1D12A355694D} static const GUID g_GUID = {0x3af62198, 0x7326, 0x48fa, {0xb1, 0xfb, 0x1d, 0x12, 0xa3, 0x55, 0x69, 0x4d}}; @@ -48,7 +48,7 @@ class Plugin_BoxFilter : public PluginInterface_Filters { int TC_PluginSetSharedIO(void* Shared); int TC_PluginGetVersion(TC_PluginVersion* pPluginVersion); - int TC_GenerateMIPLevels(MipSet* pMipSet, CMP_CFilterParams* pD3DXFilterParams); + int TC_CFilter(MipSet* pMipSet, CMP_MipSet* pMipSetDst, CMP_CFilterParams* pD3DXFilterParams); private: void Error(TCHAR* pszCaption, TC_ErrorLevel errorLevel, UINT nErrorString); diff --git a/applications/_plugins/cfilter/cmakelists.txt b/applications/_plugins/cfilter/cmakelists.txt index 7ccd72e15..5748bcde4 100644 --- a/applications/_plugins/cfilter/cmakelists.txt +++ b/applications/_plugins/cfilter/cmakelists.txt @@ -1,30 +1,32 @@ +if (OPTION_CMP_DIRECTX ) link_directories( ${PROJECT_SOURCE_DIR}/../common/lib/ext/directxtex/DirectXTex-jun2020b/DirectXTex/Bin/Desktop_2017/x64/Release ${PROJECT_SOURCE_DIR}/../common/lib/ext/directxtex/DirectXTex-jun2020b/DirectXTex/Bin/Desktop_2017/x64/Debug ) +endif() -add_library(Plugin_CFilter SHARED) +add_library(Plugin_CFilter_MipMap SHARED) -target_sources(Plugin_CFilter PRIVATE +target_sources(Plugin_CFilter_MipMap PRIVATE - BoxFilter.cpp - BoxFilter.h - ${PROJECT_SOURCE_DIR}/Applications/_Plugins/CMP_D3DX/Module.cpp - ${PROJECT_SOURCE_DIR}/Applications/_Plugins/CMP_D3DX/Module.h - ${PROJECT_SOURCE_DIR}/Applications/_Plugins/CMP_D3DX/D3DXModule.cpp - ${PROJECT_SOURCE_DIR}/Applications/_Plugins/CMP_D3DX/D3DXModule.h - ${PROJECT_SOURCE_DIR}/Applications/_Plugins/CMP_D3DX/D3D9Module.cpp - ${PROJECT_SOURCE_DIR}/Applications/_Plugins/CMP_D3DX/D3D9Module.h + boxfilter.cpp + boxfilter.h + ${PROJECT_SOURCE_DIR}/applications/_plugins/cmp_d3dx/module.cpp + ${PROJECT_SOURCE_DIR}/applications/_plugins/cmp_d3dx/module.h + ${PROJECT_SOURCE_DIR}/applications/_plugins/cmp_d3dx/d3dxmodule.cpp + ${PROJECT_SOURCE_DIR}/applications/_plugins/cmp_d3dx/d3dxmodule.h + ${PROJECT_SOURCE_DIR}/applications/_plugins/cmp_d3dx/d3d9module.cpp + ${PROJECT_SOURCE_DIR}/applications/_plugins/cmp_d3dx/d3d9module.h ) -target_include_directories(Plugin_CFilter PUBLIC +target_include_directories(Plugin_CFilter_MipMap PUBLIC ./ - ${PROJECT_SOURCE_DIR}/../Common/Lib/Ext/apitrace/dxsdk/Include - ${PROJECT_SOURCE_DIR}/Applications/_Plugins/CMP_D3DX + ${PROJECT_SOURCE_DIR}/../common/lib/ext/apitrace/dxsdk/Include + ${PROJECT_SOURCE_DIR}/applications/_plugins/cmp_d3dx #${PROJECT_SOURCE_DIR}/../Common/Lib/Ext/DirectX-SDK/June-2010/Include ) -target_link_libraries(Plugin_CFilter PRIVATE +target_link_libraries(Plugin_CFilter_MipMap PRIVATE CMP_FileIO CompressonatorLIB @@ -33,7 +35,7 @@ target_link_libraries(Plugin_CFilter PRIVATE Plugin_TCPluginAPI ) -set_target_properties(Plugin_CFilter PROPERTIES +set_target_properties(Plugin_CFilter_MipMap PROPERTIES FOLDER ${FOLDER_NAME} RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin/debug/plugins" RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin/release/plugins" diff --git a/applications/_plugins/cfilter_fx/CMakeLists.txt b/applications/_plugins/cfilter_fx/CMakeLists.txt new file mode 100644 index 000000000..5485ca216 --- /dev/null +++ b/applications/_plugins/cfilter_fx/CMakeLists.txt @@ -0,0 +1,36 @@ + +if (OPTION_CMP_DIRECTX ) +link_directories( + ${PROJECT_SOURCE_DIR}/../common/lib/ext/directxtex/DirectXTex-jun2020b/DirectXTex/Bin/Desktop_2017/x64/Release + ${PROJECT_SOURCE_DIR}/../common/lib/ext/directxtex/DirectXTex-jun2020b/DirectXTex/Bin/Desktop_2017/x64/Debug + ) +endif() + +add_library(Plugin_CFilter_Fx SHARED) + +target_sources(Plugin_CFilter_Fx PRIVATE + + filterfx.cpp + filterfx.h +) + +target_include_directories(Plugin_CFilter_Fx PUBLIC + ./ + ${PROJECT_SOURCE_DIR}/../common/lib/ext/apitrace/dxsdk/Include +) + +target_link_libraries(Plugin_CFilter_Fx PRIVATE + + CMP_FileIO + CompressonatorLIB + Plugin_CmdLine + Plugin_PluginManager + Plugin_TCPluginAPI +) + +set_target_properties(Plugin_CFilter_Fx PROPERTIES + FOLDER ${FOLDER_NAME} + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin/debug/plugins" + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin/release/plugins" + ) + diff --git a/applications/_plugins/cfilter_fx/filterfx.cpp b/applications/_plugins/cfilter_fx/filterfx.cpp new file mode 100644 index 000000000..3a815874f --- /dev/null +++ b/applications/_plugins/cfilter_fx/filterfx.cpp @@ -0,0 +1,114 @@ +//============================================================================= +// Copyright (c) 2020 Advanced Micro Devices, Inc. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files(the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions : +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +//============================================================================== +#include "filterfx.h" + +#define BUILD_AS_PLUGIN_DLL + +// Windows Header Files: +#ifdef _WIN32 +#include +#endif + +#include +#include +#include +#include + +#include +#include +#ifndef _WIN32 +#include "textureio.h" +#endif +#include + +#ifdef BUILD_AS_PLUGIN_DLL +DECLARE_PLUGIN(Plugin_CFilterFx) +SET_PLUGIN_TYPE("FILTERS") +SET_PLUGIN_NAME("EFFECTS") +#else +void* make_Plugin_CFilterFx() +{ + return new Plugin_CFilterFx; +} +#endif + +CMIPS *CFilterMipsFx = NULL; + +Plugin_CFilterFx::Plugin_CFilterFx() +{ +} + +Plugin_CFilterFx::~Plugin_CFilterFx() +{ + CFilterMipsFx = NULL; +} + +// Not used return error! +int Plugin_CFilterFx::TC_PluginSetSharedIO(void* SharedCMips) +{ + // check if already initialized + if (CFilterMipsFx != NULL) + return CMP_OK; + + if (SharedCMips && CFilterMipsFx == NULL) + { + CFilterMipsFx = reinterpret_cast(SharedCMips); + return CMP_OK; + } else + CFilterMipsFx = NULL; + + return CMP_ERR_GENERIC; +} + +int Plugin_CFilterFx::TC_PluginGetVersion(TC_PluginVersion* pPluginVersion) +{ +#ifdef _WIN32 + pPluginVersion->guid = g_GUID; +#endif + pPluginVersion->dwAPIVersionMajor = TC_API_VERSION_MAJOR; + pPluginVersion->dwAPIVersionMinor = TC_API_VERSION_MINOR; + pPluginVersion->dwPluginVersionMajor = TC_PLUGIN_VERSION_MAJOR; + pPluginVersion->dwPluginVersionMinor = TC_PLUGIN_VERSION_MINOR; + return 0; +} + +//nMinSize : The size in pixels used to determine how many mip levels to generate. Once all dimensions are less than or equal to nMinSize your mipper should generate no more mip levels. +int Plugin_CFilterFx::TC_CFilter(MipSet* pMipSetSrc, CMP_MipSet* pMipSetDst, CMP_CFilterParams* pCFilterParams) +{ + (pMipSetDst); + assert(pMipSetSrc); + assert(pMipSetSrc->m_nMipLevels); + int result = CMP_OK; + if (!CFilterMipsFx) + return CMP_ERR_PLUGIN_SHAREDIO_NOT_SET; + return result; +} + +//-------------------------------------------------------------------------------------------- +// DirectX Filter +//-------------------------------------------------------------------------------------------- +void Plugin_CFilterFx::Error(TCHAR* pszCaption, TC_ErrorLevel errorLevel, UINT nErrorString) +{ + // Add code to print message to caller +} + diff --git a/applications/_plugins/cfilter_fx/filterfx.h b/applications/_plugins/cfilter_fx/filterfx.h new file mode 100644 index 000000000..0b602a5d4 --- /dev/null +++ b/applications/_plugins/cfilter_fx/filterfx.h @@ -0,0 +1,56 @@ +//===================================================================== +// Copyright 2008 (c), ATI Technologies Inc. All rights reserved. +// Copyright 2020 (c), Advanced Micro Devices, Inc. All rights reserved. +//===================================================================== +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files(the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions : +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// + +#ifndef _PLUGIN_IMAGE_H +#define _PLUGIN_IMAGE_H + +#include "plugininterface.h" + +#ifdef _WIN32 +#include "d3d11.h" + +// {3AF62198-7326-48FA-B1FB-1D12A355694D} +static const GUID g_GUID = {0x3af62198, 0x7326, 0x48fa, {0xb1, 0xfb, 0x1d, 0x12, 0xa3, 0x55, 0x69, 0x4d}}; +#else +static const GUID g_GUID = {0}; +#endif + +#define TC_PLUGIN_VERSION_MAJOR 1 +#define TC_PLUGIN_VERSION_MINOR 0 + +class Plugin_CFilterFx : public PluginInterface_Filters +{ + public: + Plugin_CFilterFx(); + virtual ~Plugin_CFilterFx(); + + int TC_PluginSetSharedIO(void* Shared); + int TC_PluginGetVersion(TC_PluginVersion* pPluginVersion); + int TC_CFilter(MipSet* pMipSetSrc, CMP_MipSet* pMipSetDst, CMP_CFilterParams* pD3DXFilterParams); + + private: + void Error(TCHAR* pszCaption, TC_ErrorLevel errorLevel, UINT nErrorString); +}; + +#endif diff --git a/applications/_plugins/cgpudecode/cmakelists.txt b/applications/_plugins/cgpudecode/cmakelists.txt index 912014f93..2c818ece5 100644 --- a/applications/_plugins/cgpudecode/cmakelists.txt +++ b/applications/_plugins/cgpudecode/cmakelists.txt @@ -2,16 +2,16 @@ add_library(Plugin_CGPUDecode INTERFACE) if (OPTION_CMP_DIRECTX) - add_subdirectory(DirectX) + add_subdirectory(directx) target_link_libraries(Plugin_CGPUDecode INTERFACE Plugin_CGPUDecode_DirectX) endif() if (OPTION_CMP_OPENGL) - add_subdirectory(OpenGL) + add_subdirectory(opengl) target_link_libraries(Plugin_CGPUDecode INTERFACE Plugin_CGPUDecode_OpenGL) endif() if (OPTION_CMP_VULKAN) - add_subdirectory(Vulkan) + add_subdirectory(vulkan) target_link_libraries(Plugin_CGPUDecode INTERFACE Plugin_CGPUDecode_Vulkan) endif() diff --git a/applications/_plugins/cgpudecode/directx/cdirectx.cpp b/applications/_plugins/cgpudecode/directx/cdirectx.cpp index afac9bb2b..f6a6844f9 100644 --- a/applications/_plugins/cgpudecode/directx/cdirectx.cpp +++ b/applications/_plugins/cgpudecode/directx/cdirectx.cpp @@ -1,11 +1,11 @@ -#include "CDirectX.h" +#include "cdirectx.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" -#include +#include #include #include diff --git a/applications/_plugins/cgpudecode/directx/cdirectx.h b/applications/_plugins/cgpudecode/directx/cdirectx.h index 45cc5eb0f..25f2ce125 100644 --- a/applications/_plugins/cgpudecode/directx/cdirectx.h +++ b/applications/_plugins/cgpudecode/directx/cdirectx.h @@ -28,8 +28,8 @@ #pragma once #endif // _MSC_VER > 1000 -#include "GPU_DirectX.h" -#include "PluginInterface.h" +#include "gpu_directx.h" +#include "plugininterface.h" #include #include diff --git a/applications/_plugins/cgpudecode/directx/gpu_directx.cpp b/applications/_plugins/cgpudecode/directx/gpu_directx.cpp index 09f7921f6..dc8bfcdcb 100644 --- a/applications/_plugins/cgpudecode/directx/gpu_directx.cpp +++ b/applications/_plugins/cgpudecode/directx/gpu_directx.cpp @@ -22,15 +22,15 @@ // #define DECOMPRESS_SAVE_TO_BMP -#include "GPU_DirectX.h" +#include "gpu_directx.h" #include "directx_shaders\vs.h" -#include "directx_shaders\ps1D.h" -#include "directx_shaders\\ps1Darray.h" -#include "directx_shaders\\ps2D.h" -#include "directx_shaders\ps2Darray.h" -#include "directx_shaders\ps3D.h" -#include "directx_shaders\psCube.h" -#include "D3D11.h" +#include "directx_shaders\ps1d.h" +#include "directx_shaders\\ps1darray.h" +#include "directx_shaders\\ps2d.h" +#include "directx_shaders\ps2darray.h" +#include "directx_shaders\ps3d.h" +#include "directx_shaders\pscube.h" +#include "d3d11.h" using namespace DirectX; using namespace GPU_Decode; diff --git a/applications/_plugins/cgpudecode/directx/gpu_directx.h b/applications/_plugins/cgpudecode/directx/gpu_directx.h index 8d9dde3a1..b914b18b4 100644 --- a/applications/_plugins/cgpudecode/directx/gpu_directx.h +++ b/applications/_plugins/cgpudecode/directx/gpu_directx.h @@ -27,13 +27,13 @@ #ifndef H_GPU_DIRECTX #define H_GPU_DIRECTX -#include -#include +#include +#include #include #include #include -#include +#include #include diff --git a/applications/_plugins/cgpudecode/opengl/cmakelists.txt b/applications/_plugins/cgpudecode/opengl/cmakelists.txt index 9e694b73c..53f09eec2 100644 --- a/applications/_plugins/cgpudecode/opengl/cmakelists.txt +++ b/applications/_plugins/cgpudecode/opengl/cmakelists.txt @@ -3,10 +3,10 @@ add_library(Plugin_CGPUDecode_OpenGL) target_sources(Plugin_CGPUDecode_OpenGL PUBLIC - COpenGL.cpp - COpenGL.h - GPU_OpenGL.cpp - GPU_OpenGL.h + copengl.cpp + copengl.h + gpu_opengl.cpp + gpu_opengl.h shader.h ) diff --git a/applications/_plugins/cgpudecode/opengl/copengl.cpp b/applications/_plugins/cgpudecode/opengl/copengl.cpp index acc8e1a7e..468e56382 100644 --- a/applications/_plugins/cgpudecode/opengl/copengl.cpp +++ b/applications/_plugins/cgpudecode/opengl/copengl.cpp @@ -1,10 +1,10 @@ #include #include -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" -#include "COpenGL.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" +#include "copengl.h" CMIPS *COpenGL_CMips; diff --git a/applications/_plugins/cgpudecode/opengl/copengl.h b/applications/_plugins/cgpudecode/opengl/copengl.h index 8fec83c07..ebd5dceea 100644 --- a/applications/_plugins/cgpudecode/opengl/copengl.h +++ b/applications/_plugins/cgpudecode/opengl/copengl.h @@ -28,8 +28,8 @@ #include #include -#include "GPU_OpenGL.h" -#include "PluginInterface.h" +#include "gpu_opengl.h" +#include "plugininterface.h" // {D88C7EB3-38D3-4B75-BE14-22ED445156FE} static const GUID g_GUID_OPENGL = { 0xd88c7eb3, 0x38d3, 0x4b75,{ 0xbe, 0x14, 0x22, 0xed, 0x44, 0x51, 0x56, 0xfe } }; diff --git a/applications/_plugins/cgpudecode/opengl/gpu_opengl.cpp b/applications/_plugins/cgpudecode/opengl/gpu_opengl.cpp index 588067944..1fce12230 100644 --- a/applications/_plugins/cgpudecode/opengl/gpu_opengl.cpp +++ b/applications/_plugins/cgpudecode/opengl/gpu_opengl.cpp @@ -23,16 +23,16 @@ // //===================================================================== -#include "GPU_OpenGL.h" -#include "Common.h" -#include "Compressonator.h" +#include "gpu_opengl.h" +#include "common.h" +#include "compressonator.h" #include #include #include #include -#include "GPU_Decode.h" +#include "gpu_decode.h" #include diff --git a/applications/_plugins/cgpudecode/opengl/gpu_opengl.h b/applications/_plugins/cgpudecode/opengl/gpu_opengl.h index dae4f025b..e234f1f56 100644 --- a/applications/_plugins/cgpudecode/opengl/gpu_opengl.h +++ b/applications/_plugins/cgpudecode/opengl/gpu_opengl.h @@ -26,9 +26,9 @@ #ifndef H_GPU_OPENGL #define H_GPU_OPENGL -#include "GPU_DecodeBase.h" -#include "GPU_Decode.h" -#include "Compressonator.h" +#include "gpu_decodebase.h" +#include "gpu_decode.h" +#include "compressonator.h" namespace GPU_Decode { class GPU_OpenGL : public RenderWindow { diff --git a/applications/_plugins/cgpudecode/vulkan/cvulkan.cpp b/applications/_plugins/cgpudecode/vulkan/cvulkan.cpp index 737849e4b..4ad4e0f3c 100644 --- a/applications/_plugins/cgpudecode/vulkan/cvulkan.cpp +++ b/applications/_plugins/cgpudecode/vulkan/cvulkan.cpp @@ -1,10 +1,10 @@ #include #include -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" -#include "CVulkan.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" +#include "cvulkan.h" CMIPS *CVulkan_CMips; diff --git a/applications/_plugins/cgpudecode/vulkan/cvulkan.h b/applications/_plugins/cgpudecode/vulkan/cvulkan.h index 49ba7c2e6..f6bb20c7b 100644 --- a/applications/_plugins/cgpudecode/vulkan/cvulkan.h +++ b/applications/_plugins/cgpudecode/vulkan/cvulkan.h @@ -30,8 +30,8 @@ // TODO: reference additional headers your program requires here #include #include -#include "GPU_Vulkan.h" -#include "PluginInterface.h" +#include "gpu_vulkan.h" +#include "plugininterface.h" // {D88C7EB3-38D3-4B75-BE14-22ED445156FE} static const GUID g_GUID_VULKAN = { 0xd88c7eb3, 0x38d3, 0x4b75,{ 0xbe, 0x14, 0x22, 0xed, 0x44, 0x51, 0x56, 0xfe } }; diff --git a/applications/_plugins/cgpudecode/vulkan/gpu_vulkan.cpp b/applications/_plugins/cgpudecode/vulkan/gpu_vulkan.cpp index 31851ee1c..5af6e0023 100644 --- a/applications/_plugins/cgpudecode/vulkan/gpu_vulkan.cpp +++ b/applications/_plugins/cgpudecode/vulkan/gpu_vulkan.cpp @@ -29,7 +29,7 @@ // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) //===================================================================== -#include "GPU_Vulkan.h" +#include "gpu_vulkan.h" #pragma comment(lib, "opengl32.lib") // Open GL Link requirements in Base Code diff --git a/applications/_plugins/cgpudecode/vulkan/gpu_vulkan.h b/applications/_plugins/cgpudecode/vulkan/gpu_vulkan.h index 7d7820968..94aa7651b 100644 --- a/applications/_plugins/cgpudecode/vulkan/gpu_vulkan.h +++ b/applications/_plugins/cgpudecode/vulkan/gpu_vulkan.h @@ -34,7 +34,7 @@ #include "vulkanswapchain.hpp" #include "vulkandebug.h" -#include +#include #include #include diff --git a/applications/_plugins/cgpudecode/vulkan/vulkanswapchain.hpp b/applications/_plugins/cgpudecode/vulkan/vulkanswapchain.hpp index 3e4f289cc..904296a5a 100644 --- a/applications/_plugins/cgpudecode/vulkan/vulkanswapchain.hpp +++ b/applications/_plugins/cgpudecode/vulkan/vulkanswapchain.hpp @@ -11,7 +11,7 @@ #pragma once -#include +#include #include #include diff --git a/applications/_plugins/cimage/astc/castc.cpp b/applications/_plugins/cimage/astc/castc.cpp index 9e1ea8405..2a023ad20 100644 --- a/applications/_plugins/cimage/astc/castc.cpp +++ b/applications/_plugins/cimage/astc/castc.cpp @@ -24,13 +24,13 @@ #include #include -#include "Common.h" -#include "Compressonator.h" +#include "common.h" +#include "compressonator.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" -#include "cASTC.h" +#include "castc.h" #ifdef BUILD_AS_PLUGIN_DLL DECLARE_PLUGIN(Plugin_ASTC) diff --git a/applications/_plugins/cimage/astc/castc.h b/applications/_plugins/cimage/astc/castc.h index 63c7e98d6..b566be243 100644 --- a/applications/_plugins/cimage/astc/castc.h +++ b/applications/_plugins/cimage/astc/castc.h @@ -24,7 +24,7 @@ #ifndef _PLUGIN_IMAGE_ASTC_H #define _PLUGIN_IMAGE_ASTC_H -#include "PluginInterface.h" +#include "plugininterface.h" #include "stdint.h" // {3C9D75E9-D2CB-43F2-B371-D8D38FC8F306} diff --git a/applications/_plugins/cimage/astc/cmakelists.txt b/applications/_plugins/cimage/astc/cmakelists.txt index d17c94b21..6ad1a2082 100644 --- a/applications/_plugins/cimage/astc/cmakelists.txt +++ b/applications/_plugins/cimage/astc/cmakelists.txt @@ -3,8 +3,8 @@ add_library(Plugin_CImage_ASTC) target_sources(Plugin_CImage_ASTC PRIVATE - cASTC.h - cASTC.cpp + castc.h + castc.cpp ) target_link_libraries(Plugin_CImage_ASTC PRIVATE diff --git a/applications/_plugins/cimage/cmakelists.txt b/applications/_plugins/cimage/cmakelists.txt index 95ba7b13f..cb6d34a7f 100644 --- a/applications/_plugins/cimage/cmakelists.txt +++ b/applications/_plugins/cimage/cmakelists.txt @@ -1,11 +1,11 @@ add_library(Plugin_CImage INTERFACE) -add_subdirectory(ASTC) -add_subdirectory(DDS) -add_subdirectory(EXR) -add_subdirectory(KTX) -add_subdirectory(TGA) +add_subdirectory(astc) +add_subdirectory(dds) +add_subdirectory(exr) +add_subdirectory(ktx) +add_subdirectory(tga) target_link_libraries(Plugin_CImage INTERFACE diff --git a/applications/_plugins/cimage/dds/cmakelists.txt b/applications/_plugins/cimage/dds/cmakelists.txt index 82e1d2a99..0549b58af 100644 --- a/applications/_plugins/cimage/dds/cmakelists.txt +++ b/applications/_plugins/cimage/dds/cmakelists.txt @@ -3,14 +3,14 @@ add_library(Plugin_CImage_DDS) target_sources(Plugin_CImage_DDS PRIVATE - DDS.cpp - DDS.h - DDS_DX10.cpp - DDS_DX10.h - DDS_File.cpp - DDS_File.h - DDS_Helpers.cpp - DDS_Helpers.h + dds.cpp + dds.h + dds_dx10.cpp + dds_dx10.h + dds_file.cpp + dds_file.h + dds_helpers.cpp + dds_helpers.h ) target_link_libraries(Plugin_CImage_DDS PRIVATE diff --git a/applications/_plugins/cimage/dds/dds.cpp b/applications/_plugins/cimage/dds/dds.cpp index 3257019be..2192fdb51 100644 --- a/applications/_plugins/cimage/dds/dds.cpp +++ b/applications/_plugins/cimage/dds/dds.cpp @@ -25,20 +25,20 @@ #include #include -#include "Common.h" -#include "Compressonator.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" +#include "common.h" +#include "compressonator.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" #ifdef _WIN32 #include "ddraw.h" #include "d3d9types.h" #endif -#include "DDS.h" -#include "DDS_File.h" -#include "DDS_DX10.h" -#include "DDS_Helpers.h" +#include "dds.h" +#include "dds_file.h" +#include "dds_dx10.h" +#include "dds_helpers.h" #define _CRT_SECURE_NO_WARNINGS diff --git a/applications/_plugins/cimage/dds/dds.h b/applications/_plugins/cimage/dds/dds.h index a417c2fa3..51db54025 100644 --- a/applications/_plugins/cimage/dds/dds.h +++ b/applications/_plugins/cimage/dds/dds.h @@ -25,7 +25,7 @@ #ifndef _DDS_H #define _DDS_H -#include "PluginInterface.h" +#include "plugininterface.h" #ifdef _WIN32 #include "ddraw.h" diff --git a/applications/_plugins/cimage/dds/dds_dx10.cpp b/applications/_plugins/cimage/dds/dds_dx10.cpp index 251aaabba..04a65b20d 100644 --- a/applications/_plugins/cimage/dds/dds_dx10.cpp +++ b/applications/_plugins/cimage/dds/dds_dx10.cpp @@ -38,17 +38,17 @@ #ifdef _WIN32 #include "ddraw.h" -#include "DXGIFormat.h" -#include "D3D10.h" +#include "dxgiformat.h" +#include "d3d10.h" #endif -#include "Common.h" -#include "Compressonator.h" -#include "TC_PluginAPI.h" -#include "DDS_DX10.h" -#include "DDS_Helpers.h" -#include "Version.h" -#include "Texture.h" +#include "common.h" +#include "compressonator.h" +#include "tc_pluginapi.h" +#include "dds_dx10.h" +#include "dds_helpers.h" +#include "version.h" +#include "texture.h" TC_PluginError LoadDDS_DX10_RGBA_32F(FILE* pFile, DDSD2* pDDSD, MipSet* pMipSet); TC_PluginError LoadDDS_DX10_RGBA32(FILE* pFile, DDSD2* pDDSD, MipSet* pMipSet); diff --git a/applications/_plugins/cimage/dds/dds_dx10.h b/applications/_plugins/cimage/dds/dds_dx10.h index 54691e24e..a9a20c8f1 100644 --- a/applications/_plugins/cimage/dds/dds_dx10.h +++ b/applications/_plugins/cimage/dds/dds_dx10.h @@ -26,8 +26,8 @@ #pragma once -#include "TC_PluginAPI.h" -#include "DDS_File.h" +#include "tc_pluginapi.h" +#include "dds_file.h" TC_PluginError LoadDDS_DX10(FILE* pFile, DDSD2* pDDSD, MipSet* pMipSet); diff --git a/applications/_plugins/cimage/dds/dds_file.cpp b/applications/_plugins/cimage/dds/dds_file.cpp index 90eb2e83d..f792e1e40 100644 --- a/applications/_plugins/cimage/dds/dds_file.cpp +++ b/applications/_plugins/cimage/dds/dds_file.cpp @@ -35,20 +35,20 @@ #include #include -#include "Common.h" -#include "Compressonator.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" +#include "common.h" +#include "compressonator.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" #ifdef _WIN32 #include "ddraw.h" #include "d3d9types.h" #endif -#include "DDS.h" -#include "DDS_File.h" -#include "DDS_Helpers.h" -#include "Texture.h" +#include "dds.h" +#include "dds_file.h" +#include "dds_helpers.h" +#include "texture.h" TC_PluginError LoadDDS_FourCC(FILE* pFile, DDSD2* pDDSD, MipSet* pMipSet) { diff --git a/applications/_plugins/cimage/dds/dds_file.h b/applications/_plugins/cimage/dds/dds_file.h index 572eda070..14dc36928 100644 --- a/applications/_plugins/cimage/dds/dds_file.h +++ b/applications/_plugins/cimage/dds/dds_file.h @@ -25,7 +25,7 @@ #ifndef _DDS_FILE_H #define _DDS_FILE_H -#include "PluginInterface.h" +#include "plugininterface.h" #ifdef _WIN32 #include "ddraw.h" diff --git a/applications/_plugins/cimage/dds/dds_helpers.cpp b/applications/_plugins/cimage/dds/dds_helpers.cpp index 015eb55ab..c81f2b305 100644 --- a/applications/_plugins/cimage/dds/dds_helpers.cpp +++ b/applications/_plugins/cimage/dds/dds_helpers.cpp @@ -30,11 +30,11 @@ #include #include -#include "DDS.h" -#include "DDS_File.h" -#include "DDS_Helpers.h" -#include "TC_PluginAPI.h" -#include "Version.h" +#include "dds.h" +#include "dds_file.h" +#include "dds_helpers.h" +#include "tc_pluginapi.h" +#include "version.h" extern int CMP_MaxFacesOrSlices(const MipSet* pMipSet, int nMipLevel); typedef TC_PluginError (PreLoopFunction)(FILE*& pFile, DDSD2*& pDDSD, MipSet*& pMipSet, void*& extra); diff --git a/applications/_plugins/cimage/dds/dds_helpers.h b/applications/_plugins/cimage/dds/dds_helpers.h index 25445aac0..07c6c5a30 100644 --- a/applications/_plugins/cimage/dds/dds_helpers.h +++ b/applications/_plugins/cimage/dds/dds_helpers.h @@ -28,9 +28,9 @@ #pragma once -#include "TC_PluginAPI.h" -#include "Texture.h" -#include "DDS.h" +#include "tc_pluginapi.h" +#include "texture.h" +#include "dds.h" typedef struct _ARGB8888Struct { int nFlags; diff --git a/applications/_plugins/cimage/exr/cmakelists.txt b/applications/_plugins/cimage/exr/cmakelists.txt index 6d65e307b..2c1d769c5 100644 --- a/applications/_plugins/cimage/exr/cmakelists.txt +++ b/applications/_plugins/cimage/exr/cmakelists.txt @@ -3,8 +3,8 @@ add_library(Plugin_CImage_EXR) target_sources(Plugin_CImage_EXR PRIVATE - EXR.h - EXR.cpp + exr.h + exr.cpp ) target_link_libraries(Plugin_CImage_EXR PRIVATE diff --git a/applications/_plugins/cimage/exr/exr.cpp b/applications/_plugins/cimage/exr/exr.cpp index 76b404f2e..474aeac98 100644 --- a/applications/_plugins/cimage/exr/exr.cpp +++ b/applications/_plugins/cimage/exr/exr.cpp @@ -62,13 +62,13 @@ IMath.lib;Half.lib;IlmImf.lib;IlmThread.lib;Iex.lib;zlibstatic_d.lib; #include "EXR.h" #include #include -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" -#include "Common.h" +#include "common.h" #include -#include "cExr.h" +#include "cexr.h" #pragma warning( push ) #pragma warning(disable:4100) @@ -89,7 +89,7 @@ IMath.lib;Half.lib;IlmImf.lib;IlmThread.lib;Iex.lib;zlibstatic_d.lib; #pragma warning( pop ) -#include "Common.h" +#include "common.h" CMIPS *EXR_CMips = NULL; diff --git a/applications/_plugins/cimage/exr/exr.h b/applications/_plugins/cimage/exr/exr.h index fc800b79f..447748076 100644 --- a/applications/_plugins/cimage/exr/exr.h +++ b/applications/_plugins/cimage/exr/exr.h @@ -24,7 +24,7 @@ #ifndef _PLUGIN_IMAGE_EXR_H #define _PLUGIN_IMAGE_EXR_H -#include "PluginInterface.h" +#include "plugininterface.h" #define IDS_STRING1 1 #define IDS_ERROR_FILE_OPEN 1 diff --git a/applications/_plugins/cimage/ktx/cktx.h b/applications/_plugins/cimage/ktx/cktx.h index c03892320..da5f8a478 100644 --- a/applications/_plugins/cimage/ktx/cktx.h +++ b/applications/_plugins/cimage/ktx/cktx.h @@ -24,7 +24,7 @@ #ifndef _PLUGIN_IMAGE_KTX_H #define _PLUGIN_IMAGE_KTX_H -#include "PluginInterface.h" +#include "plugininterface.h" #include #include "stdint.h" diff --git a/applications/_plugins/cimage/ktx/cmakelists.txt b/applications/_plugins/cimage/ktx/cmakelists.txt index fecf67d60..0c22460af 100644 --- a/applications/_plugins/cimage/ktx/cmakelists.txt +++ b/applications/_plugins/cimage/ktx/cmakelists.txt @@ -1,11 +1,13 @@ add_library(Plugin_CImage_KTX) -add_dependencies(Plugin_CImage_KTX extern_ktx) +if (CMP_HOST_WINDOWS) + add_dependencies(Plugin_CImage_KTX extern_ktx) +endif() target_sources(Plugin_CImage_KTX PRIVATE - KTX.cpp - cKTX.h + ktx.cpp + cktx.h softfloat.cpp softfloat.h ) diff --git a/applications/_plugins/cimage/ktx/ktx.cpp b/applications/_plugins/cimage/ktx/ktx.cpp index 967e1c279..162d5a57e 100644 --- a/applications/_plugins/cimage/ktx/ktx.cpp +++ b/applications/_plugins/cimage/ktx/ktx.cpp @@ -26,16 +26,16 @@ #include #endif -#include "cKTX.h" +#include "cktx.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Common.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "common.h" #include "softfloat.h" #ifndef _WIN32 -#include "TextureIO.h" +#include "textureio.h" #endif #include diff --git a/applications/_plugins/cimage/tga/cmakelists.txt b/applications/_plugins/cimage/tga/cmakelists.txt index 93fb567d0..210c84809 100644 --- a/applications/_plugins/cimage/tga/cmakelists.txt +++ b/applications/_plugins/cimage/tga/cmakelists.txt @@ -3,8 +3,8 @@ add_library(Plugin_CImage_TGA) target_sources(Plugin_CImage_TGA PRIVATE - TGA.cpp - TGA.h + tga.cpp + tga.h ) target_link_libraries(Plugin_CImage_TGA PRIVATE diff --git a/applications/_plugins/cimage/tga/tga.cpp b/applications/_plugins/cimage/tga/tga.cpp index 2c2234df0..f57db1005 100644 --- a/applications/_plugins/cimage/tga/tga.cpp +++ b/applications/_plugins/cimage/tga/tga.cpp @@ -1,10 +1,10 @@ #include #include -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" -#include "TGA.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" +#include "tga.h" CMIPS *TGA_CMips; TGA_FileSaveParams g_FileSaveParams; @@ -69,7 +69,7 @@ int Plugin_TGA::TC_PluginFileSaveTexture(const char* pszFilename, CMP_Texture *s return 0; } -// #include "LoadTGA.h" +// #include "loadtga.h" int Plugin_TGA::TC_PluginFileLoadTexture(const char* pszFilename, MipSet* pMipSet) { CMP_CMIPS lCMips; diff --git a/applications/_plugins/cimage/tga/tga.h b/applications/_plugins/cimage/tga/tga.h index 8ca77fc7c..3f7719cce 100644 --- a/applications/_plugins/cimage/tga/tga.h +++ b/applications/_plugins/cimage/tga/tga.h @@ -13,7 +13,7 @@ #include #endif -#include "PluginInterface.h" +#include "plugininterface.h" // ---------------- TGA Plugin ------------------------ #ifdef _WIN32 diff --git a/applications/_plugins/cmakelists.txt b/applications/_plugins/cmakelists.txt index d02b1b7fa..0e706c3ac 100644 --- a/applications/_plugins/cmakelists.txt +++ b/applications/_plugins/cmakelists.txt @@ -2,29 +2,37 @@ set(FOLDER_NAME _Plugins_static) -add_subdirectory(ATIFormats) -add_subdirectory(C3DModel_Loaders) -add_subdirectory(C3DModel_viewers) -add_subdirectory(CAnalysis) -add_subdirectory(CCMP_Encode) -add_subdirectory(CCMP_SDK) -add_subdirectory(CGPUDecode) -add_subdirectory(CImage) -add_subdirectory(CmdLine) -add_subdirectory(CMesh) -add_subdirectory(Common) -add_subdirectory(GLTF) -add_subdirectory(Half) -add_subdirectory(Json) -add_subdirectory(ModelViewer) -add_subdirectory(PluginManager) -add_subdirectory(PSNR) -add_subdirectory(TCPluginAPI) -add_subdirectory(UserInterface) +add_subdirectory(atiformats) +add_subdirectory(c3dmodel_loaders) +add_subdirectory(canalysis) +add_subdirectory(ccmp_encode) +add_subdirectory(ccmp_sdk) +add_subdirectory(cgpudecode) +add_subdirectory(cimage) +add_subdirectory(cmdline) +add_subdirectory(cmesh) +add_subdirectory(common) +add_subdirectory(gltf) +add_subdirectory(half) +add_subdirectory(json) +add_subdirectory(pluginmanager) +add_subdirectory(psnr) +add_subdirectory(tcpluginapi) +add_subdirectory(userinterface) + +if (OPTION_BUILD_GUI) + add_subdirectory(c3dmodel_viewers) + add_subdirectory(modelviewer) +endif() + set(FOLDER_NAME _Plugins_dynamic) -add_subdirectory(CMP_GPU) -add_subdirectory(CFilter) +add_subdirectory(cmp_gpu) + +if (OPTION_CMP_DIRECTX) +add_subdirectory(cfilter) +add_subdirectory(cfilter_fx) +endif() # ======================================================================= diff --git a/applications/_plugins/cmdline/cmakelists.txt b/applications/_plugins/cmdline/cmakelists.txt index 5558a2637..7bd15758f 100644 --- a/applications/_plugins/cmdline/cmakelists.txt +++ b/applications/_plugins/cmdline/cmakelists.txt @@ -3,21 +3,22 @@ add_library(Plugin_CmdLine) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../Common) +set(LEGACY_LOCATION ../common) target_sources(Plugin_CmdLine PRIVATE ${LEGACY_LOCATION}/cmdline.cpp ${LEGACY_LOCATION}/cmdline.h - ${LEGACY_LOCATION}/TextureIO.h - ${LEGACY_LOCATION}/TextureIO.cpp - ${LEGACY_LOCATION}/MipsToQImage.cpp - ${LEGACY_LOCATION}/MipsToQImage.h + ${LEGACY_LOCATION}/textureio.h + ${LEGACY_LOCATION}/textureio.cpp + ${LEGACY_LOCATION}/mipstoqimage.cpp + ${LEGACY_LOCATION}/mipstoqimage.h ) target_include_directories(Plugin_CmdLine PUBLIC ./ ${LEGACY_LOCATION} + ${PROJECT_SOURCE_DIR}/applications/_libs/gpu_decode ) target_link_libraries(Plugin_CmdLine @@ -28,6 +29,7 @@ target_link_libraries(Plugin_CmdLine CMP_MeshCompressor CMP_MeshOptimizer CompressonatorLIB + GPU_Decode Plugin_CMesh_Mesh_Optimizer Plugin_TCPluginAPI diff --git a/applications/_plugins/cmesh/cmakelists.txt b/applications/_plugins/cmesh/cmakelists.txt index f7eeba5c8..30a3e60b4 100644 --- a/applications/_plugins/cmesh/cmakelists.txt +++ b/applications/_plugins/cmesh/cmakelists.txt @@ -10,7 +10,7 @@ target_link_libraries(Plugin_CMesh INTERFACE ) if (OPTION_CMP_DIRECTX) - add_subdirectory(Tootle) + add_subdirectory(tootle) target_link_libraries(Plugin_CMesh INTERFACE Plugin_CMesh_Tootle ) diff --git a/applications/_plugins/cmesh/mesh_compressor/mesh_compressor.h b/applications/_plugins/cmesh/mesh_compressor/mesh_compressor.h index ab1203afc..a4b728b5a 100644 --- a/applications/_plugins/cmesh/mesh_compressor/mesh_compressor.h +++ b/applications/_plugins/cmesh/mesh_compressor/mesh_compressor.h @@ -38,11 +38,11 @@ #include "draco/io/point_cloud_io.h" #pragma warning( pop ) -#include "PluginInterface.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" -#include "ModelData.h" +#include "plugininterface.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" +#include "modeldata.h" using namespace draco; diff --git a/applications/_plugins/cmesh/mesh_optimizer/mesh_optimizer.h b/applications/_plugins/cmesh/mesh_optimizer/mesh_optimizer.h index 41faac837..25495763a 100644 --- a/applications/_plugins/cmesh/mesh_optimizer/mesh_optimizer.h +++ b/applications/_plugins/cmesh/mesh_optimizer/mesh_optimizer.h @@ -25,12 +25,12 @@ #include -#include "PluginInterface.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" +#include "plugininterface.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" #include "meshoptimizer.h" -#include "ModelData.h" +#include "modeldata.h" #ifdef _WIN32 // {7702EE85-0957-4EDC-9A65-58B5C5E8C4C8} diff --git a/applications/_plugins/cmesh/tootle/cmakelists.txt b/applications/_plugins/cmesh/tootle/cmakelists.txt index 7e21bd284..38017996c 100644 --- a/applications/_plugins/cmesh/tootle/cmakelists.txt +++ b/applications/_plugins/cmesh/tootle/cmakelists.txt @@ -6,8 +6,8 @@ target_sources(Plugin_CMesh_Tootle PRIVATE mesh_tootle.cpp mesh_tootle.h option.h - Timer.cpp - Timer.h + timer.cpp + timer.h ) target_include_directories(Plugin_CMesh_Tootle PRIVATE diff --git a/applications/_plugins/cmesh/tootle/mesh_tootle.cpp b/applications/_plugins/cmesh/tootle/mesh_tootle.cpp index 93f41448a..90b35e699 100644 --- a/applications/_plugins/cmesh/tootle/mesh_tootle.cpp +++ b/applications/_plugins/cmesh/tootle/mesh_tootle.cpp @@ -22,13 +22,13 @@ // #include "mesh_tootle.h" -#include "Timer.h" +#include "timer.h" -#include "ModelData.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "Compressonator.h" -#include "PluginInterface.h" +#include "modeldata.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "compressonator.h" +#include "plugininterface.h" #include #include diff --git a/applications/_plugins/cmesh/tootle/mesh_tootle.h b/applications/_plugins/cmesh/tootle/mesh_tootle.h index 077e54704..9a9e9613f 100644 --- a/applications/_plugins/cmesh/tootle/mesh_tootle.h +++ b/applications/_plugins/cmesh/tootle/mesh_tootle.h @@ -27,9 +27,9 @@ #include "tootlelib.h" #ifndef USE_ASSIMP -#include "ObjLoader.h" // This should be removed and shared with Compressonator Common! +#include "objloader.h" // This should be removed and shared with Compressonator Common! #else -#include "ModelData.h" +#include "modeldata.h" #endif #ifdef _WIN32 diff --git a/applications/_plugins/cmesh/tootle/timer.cpp b/applications/_plugins/cmesh/tootle/timer.cpp index c6ed77567..2c555095c 100644 --- a/applications/_plugins/cmesh/tootle/timer.cpp +++ b/applications/_plugins/cmesh/tootle/timer.cpp @@ -3,7 +3,7 @@ /// \author AMD Developer Tools Team /// \file ****************************************************************************************/ -#include "TootlePCH.h" +#include "tootlepch.h" #ifdef _WIN32 #include #else @@ -11,7 +11,7 @@ #include #endif -#include "Timer.h" +#include "timer.h" Timer:: Timer() { diff --git a/applications/_plugins/cmp_d3dx/d3d9module.cpp b/applications/_plugins/cmp_d3dx/d3d9module.cpp index 1dc76362a..35ef42f2a 100644 --- a/applications/_plugins/cmp_d3dx/d3d9module.cpp +++ b/applications/_plugins/cmp_d3dx/d3d9module.cpp @@ -22,7 +22,7 @@ // THE SOFTWARE. // -#include "D3D9Module.h" +#include "d3d9module.h" CD3D9Module::CD3D9Module(void) : CModule() { m_pDirect3DCreate9 = NULL; diff --git a/applications/_plugins/cmp_d3dx/d3d9module.h b/applications/_plugins/cmp_d3dx/d3d9module.h index 6a532b1f1..6c74a6615 100644 --- a/applications/_plugins/cmp_d3dx/d3d9module.h +++ b/applications/_plugins/cmp_d3dx/d3d9module.h @@ -25,7 +25,7 @@ #pragma once #include "d3d9.h" -#include "Module.h" +#include "module.h" typedef IDirect3D9*(WINAPI FAR* Direct3DCreate9Proc)(UINT SDKVersion); diff --git a/applications/_plugins/cmp_d3dx/d3dxmodule.cpp b/applications/_plugins/cmp_d3dx/d3dxmodule.cpp index 1751146df..c8984a3b4 100644 --- a/applications/_plugins/cmp_d3dx/d3dxmodule.cpp +++ b/applications/_plugins/cmp_d3dx/d3dxmodule.cpp @@ -22,7 +22,7 @@ // THE SOFTWARE. // -#include "D3DXModule.h" +#include "d3dxmodule.h" TCHAR szLatestD3DX9[MAX_PATH] = ""; diff --git a/applications/_plugins/cmp_d3dx/d3dxmodule.h b/applications/_plugins/cmp_d3dx/d3dxmodule.h index ac64b6980..6798e8651 100644 --- a/applications/_plugins/cmp_d3dx/d3dxmodule.h +++ b/applications/_plugins/cmp_d3dx/d3dxmodule.h @@ -27,7 +27,7 @@ #include "string" #include "d3dx9.h" -#include "Module.h" +#include "module.h" typedef struct { const TCHAR* szModuleName; diff --git a/applications/_plugins/cmp_d3dx/module.cpp b/applications/_plugins/cmp_d3dx/module.cpp index 33a51f69f..199b53e2e 100644 --- a/applications/_plugins/cmp_d3dx/module.cpp +++ b/applications/_plugins/cmp_d3dx/module.cpp @@ -23,8 +23,8 @@ // -#include -#include "Module.h" +#include +#include "module.h" CModule::CModule(void) { m_hModule = NULL; diff --git a/applications/_plugins/cmp_gpu/cmakelists.txt b/applications/_plugins/cmp_gpu/cmakelists.txt index e6086c582..91e7847a6 100644 --- a/applications/_plugins/cmp_gpu/cmakelists.txt +++ b/applications/_plugins/cmp_gpu/cmakelists.txt @@ -1,10 +1,10 @@ add_library(Plugin_CMP_EncodeGPU INTERFACE) -add_subdirectory(DirectX) -#target_link_libraries(Plugin_CMP_GPU INTERFACE Plugin_CMP_GPU_DXC) +if (OPTION_CMP_DIRECTX) +add_subdirectory(directx) +endif() -add_subdirectory(OpenCL) -#target_link_libraries(Plugin_CMP_GPU INTERFACE Plugin_CMP_GPU_OCL) +add_subdirectory(opencl) -add_subdirectory(GpuHW) +add_subdirectory(gpuhw) diff --git a/applications/_plugins/cmp_gpu/directx/cdirectx.cpp b/applications/_plugins/cmp_gpu/directx/cdirectx.cpp index b7558d213..977f8e2ae 100644 --- a/applications/_plugins/cmp_gpu/directx/cdirectx.cpp +++ b/applications/_plugins/cmp_gpu/directx/cdirectx.cpp @@ -1,10 +1,10 @@ #include #include -#include "Compressonator.h" -#include "Common.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "CDirectX.h" +#include "compressonator.h" +#include "common.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "cdirectx.h" CMIPS *GPU_DXMips = nullptr; diff --git a/applications/_plugins/cmp_gpu/directx/cdirectx.h b/applications/_plugins/cmp_gpu/directx/cdirectx.h index f841a1241..bbe0e0081 100644 --- a/applications/_plugins/cmp_gpu/directx/cdirectx.h +++ b/applications/_plugins/cmp_gpu/directx/cdirectx.h @@ -28,11 +28,11 @@ #include #include -#include "Compressonator.h" -#include "Common.h" -#include "Compute_Base.h" -#include "Compute_DirectX.h" -#include "PluginInterface.h" +#include "compressonator.h" +#include "common.h" +#include "compute_base.h" +#include "compute_directX.h" +#include "plugininterface.h" // {21DE462B-D6C5-4F2A-99A6-2514F087946E} diff --git a/applications/_plugins/cmp_gpu/directx/cmakelists.txt b/applications/_plugins/cmp_gpu/directx/cmakelists.txt index 776af84d1..70d192f4e 100644 --- a/applications/_plugins/cmp_gpu/directx/cmakelists.txt +++ b/applications/_plugins/cmp_gpu/directx/cmakelists.txt @@ -6,10 +6,10 @@ link_directories( add_library(Plugin_CMP_GPU_DXC SHARED ) target_sources(Plugin_CMP_GPU_DXC PUBLIC - CDirectX.cpp - CDirectX.h - Compute_DirectX.cpp - Compute_DirectX.h + cdirectx.cpp + cdirectx.h + compute_directx.cpp + compute_directx.h ) target_link_libraries(Plugin_CMP_GPU_DXC @@ -24,10 +24,10 @@ PRIVATE ) target_include_directories(Plugin_CMP_GPU_DXC PRIVATE - ${PROJECT_SOURCE_DIR}/CMP_Framework # compute_base.h - ${PROJECT_SOURCE_DIR}/CMP_Core/shaders # common_def.h - ${PROJECT_SOURCE_DIR}/CMP_Core/source # cmp_math_vec4.h - ${PROJECT_SOURCE_DIR}/Applications/_Libs/CMP_Math #cmp_math_common.h + ${PROJECT_SOURCE_DIR}/cmp_framework # compute_base.h + ${PROJECT_SOURCE_DIR}/cmp_core/shaders # common_def.h + ${PROJECT_SOURCE_DIR}/cmp_core/source # cmp_math_vec4.h + ${PROJECT_SOURCE_DIR}/applications/_libs/cmp_math #cmp_math_common.h ${PROJECT_SOURCE_DIR}/../common/lib/ext/directxtex/DirectXTex-jun2020b/DirectXTex ) diff --git a/applications/_plugins/cmp_gpu/directx/compute_directx.cpp b/applications/_plugins/cmp_gpu/directx/compute_directx.cpp index 57cfe8389..c18b03504 100644 --- a/applications/_plugins/cmp_gpu/directx/compute_directx.cpp +++ b/applications/_plugins/cmp_gpu/directx/compute_directx.cpp @@ -48,7 +48,7 @@ // Licensed under the MIT License. //-------------------------------------------------------------------------------------- -#include "CDirectX.h" +#include "cdirectx.h" #include "stdio.h" #include "minwindef.h" // max,min #include diff --git a/applications/_plugins/cmp_gpu/directx/compute_directx.h b/applications/_plugins/cmp_gpu/directx/compute_directx.h index fbe5254db..26ff0a9a6 100644 --- a/applications/_plugins/cmp_gpu/directx/compute_directx.h +++ b/applications/_plugins/cmp_gpu/directx/compute_directx.h @@ -28,11 +28,11 @@ #define __CL_ENABLE_EXCEPTIONS -#include "Common_Def.h" +#include "common_def.h" -#include "Compute_Base.h" -#include "Common_KernelDef.h" -#include "TextureIO.h" +#include "compute_base.h" +#include "common_kerneldef.h" +#include "textureio.h" #include "crc32.h" #include #include diff --git a/applications/_plugins/cmp_gpu/gpuhw/cgpuhw.cpp b/applications/_plugins/cmp_gpu/gpuhw/cgpuhw.cpp index 0a568702e..eb1bb9098 100644 --- a/applications/_plugins/cmp_gpu/gpuhw/cgpuhw.cpp +++ b/applications/_plugins/cmp_gpu/gpuhw/cgpuhw.cpp @@ -23,11 +23,11 @@ #include #include -#include "Compressonator.h" -#include "Common.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "CGpuHW.h" +#include "compressonator.h" +#include "common.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "cgpuhw.h" #include CMIPS *GPU_HWMips = nullptr; diff --git a/applications/_plugins/cmp_gpu/gpuhw/cgpuhw.h b/applications/_plugins/cmp_gpu/gpuhw/cgpuhw.h index ebffa6957..dd32383d7 100644 --- a/applications/_plugins/cmp_gpu/gpuhw/cgpuhw.h +++ b/applications/_plugins/cmp_gpu/gpuhw/cgpuhw.h @@ -28,11 +28,11 @@ #include #include -#include "Compressonator.h" -#include "Common.h" -#include "Compute_Base.h" -#include "Compute_GpuHW.h" -#include "PluginInterface.h" +#include "compressonator.h" +#include "common.h" +#include "compute_base.h" +#include "compute_gpuhw.h" +#include "plugininterface.h" diff --git a/applications/_plugins/cmp_gpu/gpuhw/cmakelists.txt b/applications/_plugins/cmp_gpu/gpuhw/cmakelists.txt index d19497cc3..d544b6d4f 100644 --- a/applications/_plugins/cmp_gpu/gpuhw/cmakelists.txt +++ b/applications/_plugins/cmp_gpu/gpuhw/cmakelists.txt @@ -2,21 +2,21 @@ add_library(Plugin_CMP_GPU_HW SHARED ) target_sources(Plugin_CMP_GPU_HW PUBLIC - Compute_GpuHW.cpp - Compute_GpuHW.h - CGpuHW.cpp - CGpuHW.h - ${PROJECT_SOURCE_DIR}/External/glad/include/glad/glad.h - ${PROJECT_SOURCE_DIR}/External/glad/src/glad.c + compute_gpuhw.cpp + compute_gpuhw.h + cgpuhw.cpp + cgpuhw.h + ${PROJECT_SOURCE_DIR}/external/glad/include/glad/glad.h + ${PROJECT_SOURCE_DIR}/external/glad/src/glad.c ) target_include_directories(Plugin_CMP_GPU_HW PRIVATE - ${PROJECT_SOURCE_DIR}/CMP_Framework # compute_base.h - ${PROJECT_SOURCE_DIR}/CMP_Core/shaders # common_def.h - ${PROJECT_SOURCE_DIR}/CMP_Core/source # cmp_math_vec4.h - ${PROJECT_SOURCE_DIR}/Applications/_Libs/CMP_Math #cmp_math_common.h - ${PROJECT_SOURCE_DIR}/External/glad/include/ - ${PROJECT_SOURCE_DIR}/External/glad/include/glad + ${PROJECT_SOURCE_DIR}/cmp_framework # compute_base.h + ${PROJECT_SOURCE_DIR}/cmp_core/shaders # common_def.h + ${PROJECT_SOURCE_DIR}/cmp_core/source # cmp_math_vec4.h + ${PROJECT_SOURCE_DIR}/applications/_libs/cmp_math #cmp_math_common.h + ${PROJECT_SOURCE_DIR}/external/glad/include/ + ${PROJECT_SOURCE_DIR}/external/glad/include/glad ) target_link_libraries(Plugin_CMP_GPU_HW diff --git a/applications/_plugins/cmp_gpu/gpuhw/compute_gpuhw.cpp b/applications/_plugins/cmp_gpu/gpuhw/compute_gpuhw.cpp index 419ce26e9..195dea34b 100644 --- a/applications/_plugins/cmp_gpu/gpuhw/compute_gpuhw.cpp +++ b/applications/_plugins/cmp_gpu/gpuhw/compute_gpuhw.cpp @@ -21,7 +21,7 @@ // //============================================================================== -#include "Compute_GpuHW.h" +#include "compute_gpuhw.h" #ifdef USE_CPU_PERFORMANCE_COUNTERS #include "query_timer.h" // can use CPU timing but pref is to use GPU counters @@ -547,7 +547,7 @@ bool CGpuHW::CreateContext() glEnable(GL_RENDERBUFFER); - if ((m_glformat == GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT) || m_kernel_options->useSRGBFrames) + if (m_kernel_options->useSRGBFrames) glEnable(GL_FRAMEBUFFER_SRGB); else glEnable(GL_FRAMEBUFFER); diff --git a/applications/_plugins/cmp_gpu/gpuhw/compute_gpuhw.h b/applications/_plugins/cmp_gpu/gpuhw/compute_gpuhw.h index 66724a297..81a3cc439 100644 --- a/applications/_plugins/cmp_gpu/gpuhw/compute_gpuhw.h +++ b/applications/_plugins/cmp_gpu/gpuhw/compute_gpuhw.h @@ -24,12 +24,12 @@ #ifndef H_COMPUTE_GPUHW #define H_COMPUTE_GPUHW -#include "Compressonator.h" -#include "Common_Def.h" // Updated at run time -#include "Compute_Base.h" -#include "Common_KernelDef.h" +#include "compressonator.h" +#include "common_def.h" // Updated at run time +#include "compute_base.h" +#include "common_kerneldef.h" #include "query_timer.h" -#include "TextureIO.h" +#include "textureio.h" #include "crc32.h" #include "cmp_math_common.h" diff --git a/applications/_plugins/cmp_gpu/opencl/cmakelists.txt b/applications/_plugins/cmp_gpu/opencl/cmakelists.txt index fc7ec0735..ad1a2669c 100644 --- a/applications/_plugins/cmp_gpu/opencl/cmakelists.txt +++ b/applications/_plugins/cmp_gpu/opencl/cmakelists.txt @@ -6,17 +6,17 @@ add_library(Plugin_CMP_GPU_OCL SHARED ) target_sources(Plugin_CMP_GPU_OCL PUBLIC - Compute_OpenCL.cpp - Compute_OpenCL.h - COpenCL.cpp - COpenCL.h + compute_opencl.cpp + compute_opencl.h + copencl.cpp + copencl.h ) target_include_directories(Plugin_CMP_GPU_OCL PRIVATE - ${PROJECT_SOURCE_DIR}/CMP_Framework # compute_base.h - ${PROJECT_SOURCE_DIR}/CMP_Core/shaders # common_def.h - ${PROJECT_SOURCE_DIR}/CMP_Core/source # cmp_math_vec4.h - ${PROJECT_SOURCE_DIR}/Applications/_Libs/CMP_Math #cmp_math_common.h + ${PROJECT_SOURCE_DIR}/cmp_framework # compute_base.h + ${PROJECT_SOURCE_DIR}/cmp_core/shaders # common_def.h + ${PROJECT_SOURCE_DIR}/cmp_core/source # cmp_math_vec4.h + ${PROJECT_SOURCE_DIR}/applications/_libs/cmp_math #cmp_math_common.h ${PROJECT_SOURCE_DIR}/../common/lib/ext/opencl/include ) diff --git a/applications/_plugins/cmp_gpu/opencl/compute_opencl.cpp b/applications/_plugins/cmp_gpu/opencl/compute_opencl.cpp index 3d1aff9bf..406f48f20 100644 --- a/applications/_plugins/cmp_gpu/opencl/compute_opencl.cpp +++ b/applications/_plugins/cmp_gpu/opencl/compute_opencl.cpp @@ -21,7 +21,7 @@ // //============================================================================== -#include "COpenCL.h" +#include "copencl.h" #ifdef USE_CPU_PERFORMANCE_COUNTERS #include "query_timer.h" // can use CPU timing but pref is to use GPU counters @@ -489,13 +489,21 @@ bool COpenCL::load_file() { std::string tmp = m_source_file; bool rebuild = false; +#ifdef _WIN32 // Check build configuration of the shader, has it been modified since last use rebuild = cmp_recompile_shader(m_source_file); +#endif if (!rebuild) { +#ifdef _WIN32 fopen_result = fopen_s(&p_file_bin, tmp.append(".cmp").c_str(), "rb"); if (fopen_result != 0) rebuild = true; +#else + p_file_bin = fopen(tmp.append(".cmp").c_str(), "rb"); + if (p_file_bin) + rebuild = true; +#endif } // Found a .cmp file use it @@ -717,7 +725,7 @@ bool COpenCL::CreateIOBuffers() { return true; } -//#include "BCn_Common_Kernel.h" use this for debugging data to kernel when using BC15 +//#include "bcn_common_kernel.h" use this for debugging data to kernel when using BC15 bool COpenCL::RunKernel() { // QUERY_PERFORMANCE("Run Kernel "); diff --git a/applications/_plugins/cmp_gpu/opencl/compute_opencl.h b/applications/_plugins/cmp_gpu/opencl/compute_opencl.h index 40ce2f8bf..d0a0fe3bd 100644 --- a/applications/_plugins/cmp_gpu/opencl/compute_opencl.h +++ b/applications/_plugins/cmp_gpu/opencl/compute_opencl.h @@ -26,14 +26,14 @@ #define __CL_ENABLE_EXCEPTIONS -#include +#include -#include "Common_Def.h" // Updated at run time by COpenCL +#include "common_def.h" // Updated at run time by COpenCL -#include "Compute_Base.h" -#include "Common_KernelDef.h" +#include "compute_base.h" +#include "common_kerneldef.h" #include "query_timer.h" -#include "TextureIO.h" +#include "textureio.h" #include "crc32.h" #include "cmp_math_common.h" diff --git a/applications/_plugins/cmp_gpu/opencl/copencl.cpp b/applications/_plugins/cmp_gpu/opencl/copencl.cpp index e70c62018..12feb5da1 100644 --- a/applications/_plugins/cmp_gpu/opencl/copencl.cpp +++ b/applications/_plugins/cmp_gpu/opencl/copencl.cpp @@ -23,11 +23,11 @@ #include #include -#include "Compressonator.h" -#include "Common.h" -#include "TC_PluginAPI.h" -#include "TC_PluginInternal.h" -#include "COpenCL.h" +#include "compressonator.h" +#include "common.h" +#include "tc_pluginapi.h" +#include "tc_plugininternal.h" +#include "copencl.h" diff --git a/applications/_plugins/cmp_gpu/opencl/copencl.h b/applications/_plugins/cmp_gpu/opencl/copencl.h index 48416341d..0e83913a5 100644 --- a/applications/_plugins/cmp_gpu/opencl/copencl.h +++ b/applications/_plugins/cmp_gpu/opencl/copencl.h @@ -28,11 +28,11 @@ #include #include -#include "Compressonator.h" -#include "Common.h" -#include "Compute_Base.h" +#include "compressonator.h" +#include "common.h" +#include "compute_base.h" #include "Compute_OpenCL.h" -#include "PluginInterface.h" +#include "plugininterface.h" // {D88C7EB3-38D3-4B75-BE14-22ED445156FE} static const GUID g_GUID_GPU = { 0xd88c7eb3, 0x38d3, 0x4b75,{ 0xbe, 0x14, 0x22, 0xed, 0x44, 0x51, 0x56, 0xfe } }; diff --git a/applications/_plugins/common/atiformats.cpp b/applications/_plugins/common/atiformats.cpp index d022bf205..98e37174b 100644 --- a/applications/_plugins/common/atiformats.cpp +++ b/applications/_plugins/common/atiformats.cpp @@ -26,7 +26,7 @@ // //===================================================================== -#include "ATIFormats.h" +#include "atiformats.h" #include #include @@ -34,7 +34,7 @@ #include #endif -#include "Texture.h" +#include "texture.h" CMP_TextureTypeDesc g_TextureTypeDesc[] = { {TT_2D,"2D"}, @@ -132,7 +132,7 @@ CMP_FORMAT CMP_API CMP_ParseFormat(char* pFormat) { return CMP_FORMAT_Unknown; } -const CMP_CHAR* GetFormatDesc(CMP_FORMAT nFormat) { +CMP_CHAR* GetFormatDesc(CMP_FORMAT nFormat) { for(CMP_DWORD i = 0; i < g_dwFormatDescCount; i++) if(nFormat == g_FormatDesc[i].nFormat) return g_FormatDesc[i].pszFormatDesc; diff --git a/applications/_plugins/common/atiformats.h b/applications/_plugins/common/atiformats.h index 0aef76405..56090dfc5 100644 --- a/applications/_plugins/common/atiformats.h +++ b/applications/_plugins/common/atiformats.h @@ -24,13 +24,13 @@ #ifndef _AMDFORMATS_H_ #define _AMDFORMATS_H_ -#include "Compressonator.h" -#include "Common.h" +#include "compressonator.h" +#include "common.h" typedef struct { CMP_FORMAT nFormat; - const CMP_CHAR* pszFormatDesc; + CMP_CHAR* pszFormatDesc; } CMP_FormatDesc; typedef struct { @@ -49,6 +49,6 @@ CMP_BOOL CMP_API CMP_IsCompressedFormat(CMP_FORMAT format); }; #endif -const CMP_CHAR* GetFormatDesc(CMP_FORMAT nFormat); +CMP_CHAR* GetFormatDesc(CMP_FORMAT nFormat); CMP_CHAR* GetTextureTypeDesc(CMP_TextureType nTextureType); #endif \ No newline at end of file diff --git a/applications/_plugins/common/c_exr/cmakelists.txt b/applications/_plugins/common/c_exr/cmakelists.txt index f881c1e83..a92601448 100644 --- a/applications/_plugins/common/c_exr/cmakelists.txt +++ b/applications/_plugins/common/c_exr/cmakelists.txt @@ -7,9 +7,9 @@ set(LEGACY_LOCATION ../) target_sources(Plugin_Common_cExr INTERFACE - ${LEGACY_LOCATION}/cExr.cpp - ${LEGACY_LOCATION}/cExr.h - ${LEGACY_LOCATION}/namespaceAlias.h + ${LEGACY_LOCATION}/cexr.cpp + ${LEGACY_LOCATION}/cexr.h + ${LEGACY_LOCATION}/namespacealias.h ) target_include_directories(Plugin_Common_cExr INTERFACE diff --git a/applications/_plugins/common/cexr.cpp b/applications/_plugins/common/cexr.cpp index 338726173..b155fb7c1 100644 --- a/applications/_plugins/common/cexr.cpp +++ b/applications/_plugins/common/cexr.cpp @@ -25,7 +25,7 @@ #ifdef _WIN32 #include #endif -#include "cExr.h" +#include "cexr.h" float half_conv_float(unsigned short in) { union fi32 { diff --git a/applications/_plugins/common/cexr.h b/applications/_plugins/common/cexr.h index 7b54eb735..b3128fe86 100644 --- a/applications/_plugins/common/cexr.h +++ b/applications/_plugins/common/cexr.h @@ -24,7 +24,7 @@ #ifndef cEXR_HEADER #define cEXR_HEADER -#include "namespaceAlias.h" +#include "namespacealias.h" #pragma warning(push) #pragma warning(disable : 4100) @@ -39,13 +39,13 @@ #include -#include "Common.h" -#include "Compressonator.h" +#include "common.h" +#include "compressonator.h" using namespace IMF; using namespace IMATH; -#include "CMP_FileIO.h" +#include "cmp_fileio.h" #pragma warning(disable : 4201) typedef unsigned int uint; diff --git a/applications/_plugins/common/cmdline.cpp b/applications/_plugins/common/cmdline.cpp index 4ad07f3ee..a55ab835e 100644 --- a/applications/_plugins/common/cmdline.cpp +++ b/applications/_plugins/common/cmdline.cpp @@ -23,15 +23,15 @@ #include "cmdline.h" -#include "ATIFormats.h" -#include "Texture.h" -#include "TextureIO.h" -#include "PluginManager.h" -#include "PluginInterface.h" -#include "TC_PluginInternal.h" -#include "Version.h" -#include "Misc.h" -#include "CMP_FileIO.h" +#include "atiformats.h" +#include "texture.h" +#include "textureio.h" +#include "pluginmanager.h" +#include "plugininterface.h" +#include "tc_plugininternal.h" +#include "version.h" +#include "misc.h" +#include "cmp_fileio.h" #include #include @@ -39,9 +39,9 @@ #ifdef USE_MESH_CLI #include -#include -#include "ModelData.h" -#include "UtilFuncs.h" +#include +#include "modeldata.h" +#include "utilfuncs.h" using namespace tinygltf2; #if !defined(NO_LEGACY_BEHAVIOR) @@ -60,7 +60,7 @@ using namespace tinygltf2; #endif #ifdef USE_CMP_TRANSCODE -#include "CMP_Transcoder/transcoders.h" +#include "cmp_transcoder/transcoders.h" #endif // #define SHOW_PROCESS_MEMORY @@ -1583,8 +1583,8 @@ void LocalPrintF(char* buff) { printf(buff); } -#include "Common_KernelDef.h" -#include "Compute_Base.h" +#include "common_kerneldef.h" +#include "compute_base.h" bool SVMInitCodec(KernelOptions* options) { CMP_FORMAT format = options->format; diff --git a/applications/_plugins/common/cmdline.h b/applications/_plugins/common/cmdline.h index 1afeef570..3545644a7 100644 --- a/applications/_plugins/common/cmdline.h +++ b/applications/_plugins/common/cmdline.h @@ -28,9 +28,9 @@ #include #endif -#include -#include -#include +#include +#include +#include #include diff --git a/applications/_plugins/common/cmp_fileio.cpp b/applications/_plugins/common/cmp_fileio.cpp index 189f83dc5..e968550c4 100644 --- a/applications/_plugins/common/cmp_fileio.cpp +++ b/applications/_plugins/common/cmp_fileio.cpp @@ -26,10 +26,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "CMP_FileIO.h" +#include "cmp_fileio.h" #ifdef _WIN32 -#include "Windows.h" +#include "windows.h" #include #include diff --git a/applications/_plugins/common/common_kerneldef.h b/applications/_plugins/common/common_kerneldef.h index f067fabfa..02e703e65 100644 --- a/applications/_plugins/common/common_kerneldef.h +++ b/applications/_plugins/common/common_kerneldef.h @@ -27,7 +27,7 @@ #ifndef _COMMON_KERNELDEF2_H #define _COMMON_KERNELDEF2_H -#include "Common_Def.h" +#include "common_def.h" #ifndef ASPM_GPU diff --git a/applications/_plugins/common/gltf/cmakelists.txt b/applications/_plugins/common/gltf/cmakelists.txt index fbef568ca..a0c062699 100644 --- a/applications/_plugins/common/gltf/cmakelists.txt +++ b/applications/_plugins/common/gltf/cmakelists.txt @@ -1,19 +1,19 @@ set(GLTF_SRC #Error.cpp # Windows API - GltfCommon.cpp - glTFHelpers.cpp - # Misc.cpp # same as Misc.cpp in top level directory. Unsued and Windows API. + gltfcommon.cpp + gltfhelpers.cpp + # misc.cpp # same as misc.cpp in top level directory. unsued and windows api. tiny_gltf2_utils.cpp ) -set(GLTF_H +set(gltf_h defines.h - #Error.h - GltfCommon.h - GltfFeatures.h - glTFHelpers.h - GltfStructures.h - # Misc.h + #error.h + gltfcommon.h + gltffeatures.h + gltfhelpers.h + gltfstructures.h + # misc.h stb_image.h stb_image_write.h targetver.h @@ -24,10 +24,10 @@ set(GLTF_H add_library(gltf STATIC ${GLTF_H} ${GLTF_SRC}) target_include_directories(gltf PRIVATE - ../../../../CMP_CompressonatorLib - ../../../../CMP_Framework/Common/half + ../../../../cmp_compressonatorlib + ../../../../cmp_framework/common/half ${draco_INCLUDE_DIRS} - ../../../_Libs/CMP_MeshOptimizer + ../../../_libs/cmp_meshoptimizer ../json/ ../ ) diff --git a/applications/_plugins/common/gltf/dx12/gltfbboxpass.cpp b/applications/_plugins/common/gltf/dx12/gltfbboxpass.cpp index e3f6b38f7..ec8605d7a 100644 --- a/applications/_plugins/common/gltf/dx12/gltfbboxpass.cpp +++ b/applications/_plugins/common/gltf/dx12/gltfbboxpass.cpp @@ -17,12 +17,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "GltfBBoxPass.h" -#include "GltfHelpers.h" +#include "gltfbboxpass.h" +#include "gltfhelpers.h" -#include +#include -#include +#include #include using namespace DirectX; diff --git a/applications/_plugins/common/gltf/dx12/gltfbboxpass.h b/applications/_plugins/common/gltf/dx12/gltfbboxpass.h index d7a3eb4f3..bcedccad3 100644 --- a/applications/_plugins/common/gltf/dx12/gltfbboxpass.h +++ b/applications/_plugins/common/gltf/dx12/gltfbboxpass.h @@ -18,11 +18,11 @@ // THE SOFTWARE. #pragma once -#include "GltfCommon.h" -#include "GltfTechnique.h" +#include "gltfcommon.h" +#include "gltftechnique.h" -#include -#include +#include +#include #include diff --git a/applications/_plugins/common/gltf/dx12/gltfdepthpass.cpp b/applications/_plugins/common/gltf/dx12/gltfdepthpass.cpp index d6230f35c..96e480d71 100644 --- a/applications/_plugins/common/gltf/dx12/gltfdepthpass.cpp +++ b/applications/_plugins/common/gltf/dx12/gltfdepthpass.cpp @@ -17,15 +17,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "GltfDepthPass.h" -#include "GltfHelpers.h" -#include "ThreadPool.h" +#include "gltfdepthpass.h" +#include "gltfhelpers.h" +#include "threadpool.h" -#include "gltfGetFormat_DX12.h" -#include "GltfHelpers_DX12.h" +#include "gltfgetformat_dx12.h" +#include "gltfhelpers_dx12.h" -#include +#include #include diff --git a/applications/_plugins/common/gltf/dx12/gltfdepthpass.h b/applications/_plugins/common/gltf/dx12/gltfdepthpass.h index 53ad88500..86457adf5 100644 --- a/applications/_plugins/common/gltf/dx12/gltfdepthpass.h +++ b/applications/_plugins/common/gltf/dx12/gltfdepthpass.h @@ -18,8 +18,8 @@ // THE SOFTWARE. #pragma once -#include "GltfCommon.h" -#include "GltfTechnique.h" +#include "gltfcommon.h" +#include "gltftechnique.h" #include #include diff --git a/applications/_plugins/common/gltf/dx12/gltfhelpers_dx12.cpp b/applications/_plugins/common/gltf/dx12/gltfhelpers_dx12.cpp index 8a19cfc4a..797edf490 100644 --- a/applications/_plugins/common/gltf/dx12/gltfhelpers_dx12.cpp +++ b/applications/_plugins/common/gltf/dx12/gltfhelpers_dx12.cpp @@ -17,9 +17,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "glTFHelpers.h" +#include "gltfhelpers.h" -#include "glTFHelpers_DX12.h" +#include "gltfhelpers_dx12.h" void CompileMacros(const std::map *pMacros, std::vector *pOut) { diff --git a/applications/_plugins/common/gltf/dx12/gltfpbr.cpp b/applications/_plugins/common/gltf/dx12/gltfpbr.cpp index e0759af21..bb5523145 100644 --- a/applications/_plugins/common/gltf/dx12/gltfpbr.cpp +++ b/applications/_plugins/common/gltf/dx12/gltfpbr.cpp @@ -17,15 +17,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "GltfPbr.h" +#include "gltfpbr.h" -#include "GltfFeatures.h" -#include "gltfGetFormat_DX12.h" -#include "GltfHelpers_DX12.h" -#include "GltfHelpers.h" -#include "ThreadPool.h" +#include "gltffeatures.h" +#include "gltfgetformat_dx12.h" +#include "gltfhelpers_dx12.h" +#include "gltfhelpers.h" +#include "threadpool.h" -#include +#include #include #include diff --git a/applications/_plugins/common/gltf/dx12/gltfpbr.h b/applications/_plugins/common/gltf/dx12/gltfpbr.h index 2ddf87829..644d971c9 100644 --- a/applications/_plugins/common/gltf/dx12/gltfpbr.h +++ b/applications/_plugins/common/gltf/dx12/gltfpbr.h @@ -18,11 +18,11 @@ // THE SOFTWARE. #pragma once -#include "GltfCommon.h" -#include "GltfTechnique.h" -#include "SkyDome.h" +#include "gltfcommon.h" +#include "gltftechnique.h" +#include "skydome.h" -#include +#include #include extern CMIPS *DX12_CMips; diff --git a/applications/_plugins/common/gltf/dx12/gltftechnique.cpp b/applications/_plugins/common/gltf/dx12/gltftechnique.cpp index 04ad763eb..9a177a4a2 100644 --- a/applications/_plugins/common/gltf/dx12/gltftechnique.cpp +++ b/applications/_plugins/common/gltf/dx12/gltftechnique.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "GltfTechnique.h" +#include "gltftechnique.h" #include #include diff --git a/applications/_plugins/common/gltf/dx12/gltftechnique.h b/applications/_plugins/common/gltf/dx12/gltftechnique.h index d4f8fe33b..15238a654 100644 --- a/applications/_plugins/common/gltf/dx12/gltftechnique.h +++ b/applications/_plugins/common/gltf/dx12/gltftechnique.h @@ -18,13 +18,13 @@ // THE SOFTWARE. #pragma once -#include "GltfCommon.h" +#include "gltfcommon.h" -#include "DynamicBufferRingDX12.h" -#include "StaticBufferPoolDX12.h" -#include "UploadHeapDX12.h" -#include "TextureDX12.h" -#include "Camera.h" +#include "dynamicbufferringdx12.h" +#include "staticbufferpooldx12.h" +#include "uploadheapdx12.h" +#include "texturedx12.h" +#include "camera.h" // This class takes a GltfCommon class (that holds all the non-GPU specific data) as an input and loads all the GPU specific data // diff --git a/applications/_plugins/common/gltf/error.cpp b/applications/_plugins/common/gltf/error.cpp index d9600f4d8..ee04ca69b 100644 --- a/applications/_plugins/common/gltf/error.cpp +++ b/applications/_plugins/common/gltf/error.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "Error.h" +#include "error.h" #ifdef _WIN32 #include diff --git a/applications/_plugins/common/gltf/gltfcommon.cpp b/applications/_plugins/common/gltf/gltfcommon.cpp index 6de5821b7..f5b3f8127 100644 --- a/applications/_plugins/common/gltf/gltfcommon.cpp +++ b/applications/_plugins/common/gltf/gltfcommon.cpp @@ -17,9 +17,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "GltfCommon.h" +#include "gltfcommon.h" -#include "glTFHelpers.h" +#include "gltfhelpers.h" // Windows Header Files: #ifdef _WIN32 diff --git a/applications/_plugins/common/gltf/gltfcommon.h b/applications/_plugins/common/gltf/gltfcommon.h index 58ad66c1c..919bdec6e 100644 --- a/applications/_plugins/common/gltf/gltfcommon.h +++ b/applications/_plugins/common/gltf/gltfcommon.h @@ -19,11 +19,11 @@ #ifndef GLTFCOMMOM_H #define GLTFCOMMOM_H -#include "Compressonator.h" -#include "Common.h" -#include "GltfFeatures.h" -#include "GltfStructures.h" -#include "ModelData.h" +#include "compressonator.h" +#include "common.h" +#include "gltffeatures.h" +#include "gltfstructures.h" +#include "modeldata.h" #include diff --git a/applications/_plugins/common/gltf/gltfhelpers.cpp b/applications/_plugins/common/gltf/gltfhelpers.cpp index 4518cd3a2..53dd0e07a 100644 --- a/applications/_plugins/common/gltf/gltfhelpers.cpp +++ b/applications/_plugins/common/gltf/gltfhelpers.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "glTFHelpers.h" +#include "gltfhelpers.h" #ifdef _WIN32 using namespace DirectX; diff --git a/applications/_plugins/common/gltf/gltfhelpers.h b/applications/_plugins/common/gltf/gltfhelpers.h index c609c3586..6a9cd21a8 100644 --- a/applications/_plugins/common/gltf/gltfhelpers.h +++ b/applications/_plugins/common/gltf/gltfhelpers.h @@ -20,7 +20,7 @@ #pragma once -#include "GltfStructures.h" +#include "gltfstructures.h" #include #include diff --git a/applications/_plugins/common/gltf/gltfstructures.h b/applications/_plugins/common/gltf/gltfstructures.h index 7f5da248c..a910cf188 100644 --- a/applications/_plugins/common/gltf/gltfstructures.h +++ b/applications/_plugins/common/gltf/gltfstructures.h @@ -44,7 +44,7 @@ // This file holds all the structures/classes used to load a glTF model // -#include "GltfFeatures.h" +#include "gltffeatures.h" #include diff --git a/applications/_plugins/common/gltf/tiny_gltf2.h b/applications/_plugins/common/gltf/tiny_gltf2.h index 918128b44..9bb4802e7 100644 --- a/applications/_plugins/common/gltf/tiny_gltf2.h +++ b/applications/_plugins/common/gltf/tiny_gltf2.h @@ -48,8 +48,8 @@ #include #include -#include "Compressonator.h" -#include "Common.h" +#include "compressonator.h" +#include "common.h" namespace tinygltf2 { diff --git a/applications/_plugins/common/gltf/tiny_gltf2_utils.cpp b/applications/_plugins/common/gltf/tiny_gltf2_utils.cpp index 7e9ed18ff..184ecf3b9 100644 --- a/applications/_plugins/common/gltf/tiny_gltf2_utils.cpp +++ b/applications/_plugins/common/gltf/tiny_gltf2_utils.cpp @@ -26,7 +26,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "Version.h" +#include "version.h" #include "tiny_gltf2_utils.h" #include @@ -116,7 +116,7 @@ using nlohmann::json; #define FILE_SPLIT_PATH "/\\" #ifdef __APPLE__ -#include "TargetConditionals.h" +#include "targetconditionals.h" #endif #ifdef __clang__ diff --git a/applications/_plugins/common/gltf/vulkan/gltfbboxpassvk.cpp b/applications/_plugins/common/gltf/vulkan/gltfbboxpassvk.cpp index 7c5183b7f..9f9158654 100644 --- a/applications/_plugins/common/gltf/vulkan/gltfbboxpassvk.cpp +++ b/applications/_plugins/common/gltf/vulkan/gltfbboxpassvk.cpp @@ -25,17 +25,17 @@ // THE SOFTWARE. -#include "GltfBBoxPassVK.h" - -#include "DeviceVK.h" -#include "StaticBufferPoolVK.h" -#include "DynamicBufferRingVK.h" -#include "ResourceViewHeapsVK.h" -#include "UploadHeapVK.h" -#include "ShaderCompilerHelper.h" -#include "Camera.h" -#include "GltfHelpers.h" -#include "GltfHelpers_Vulkan.h" +#include "gltfbboxpassvk.h" + +#include "devicevk.h" +#include "staticbufferpoolvk.h" +#include "dynamicbufferringvk.h" +#include "resourceviewheapsvk.h" +#include "uploadheapvk.h" +#include "shadercompilerhelper.h" +#include "camera.h" +#include "gltfhelpers.h" +#include "gltfhelpers_vulkan.h" void GltfBBoxPassVK::OnCreate( diff --git a/applications/_plugins/common/gltf/vulkan/gltfbboxpassvk.h b/applications/_plugins/common/gltf/vulkan/gltfbboxpassvk.h index 6ea880eeb..ea12283a9 100644 --- a/applications/_plugins/common/gltf/vulkan/gltfbboxpassvk.h +++ b/applications/_plugins/common/gltf/vulkan/gltfbboxpassvk.h @@ -18,8 +18,8 @@ // THE SOFTWARE. #pragma once -#include "GltfCommon.h" -#include "GltfTechnique.h" +#include "gltfcommon.h" +#include "gltftechnique.h" #include #include diff --git a/applications/_plugins/common/gltf/vulkan/gltfdepthpassvk.cpp b/applications/_plugins/common/gltf/vulkan/gltfdepthpassvk.cpp index d4c1dcc6d..9f7052857 100644 --- a/applications/_plugins/common/gltf/vulkan/gltfdepthpassvk.cpp +++ b/applications/_plugins/common/gltf/vulkan/gltfdepthpassvk.cpp @@ -24,17 +24,17 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "GltfDepthPassVK.h" - -#include "DynamicBufferRingVK.h" -#include "GltfCommon.h" -#include "GltfHelpers.h" -#include "GltfHelpers_Vulkan.h" -#include "ResourceViewHeapsVK.h" -#include "ShaderCompilerHelper.h" -#include "TextureVK.h" -#include "ThreadPool.h" -#include "UploadHeapVK.h" +#include "gltfdepthpassvk.h" + +#include "dynamicbufferringvk.h" +#include "gltfcommon.h" +#include "gltfhelpers.h" +#include "gltfhelpers_vulkan.h" +#include "resourceviewheapsvk.h" +#include "shadercompilerhelper.h" +#include "texturevk.h" +#include "threadpool.h" +#include "uploadheapvk.h" #include #include diff --git a/applications/_plugins/common/gltf/vulkan/gltfdepthpassvk.h b/applications/_plugins/common/gltf/vulkan/gltfdepthpassvk.h index f7714f19d..287137bc6 100644 --- a/applications/_plugins/common/gltf/vulkan/gltfdepthpassvk.h +++ b/applications/_plugins/common/gltf/vulkan/gltfdepthpassvk.h @@ -18,9 +18,9 @@ // THE SOFTWARE. #pragma once -#include "GltfTechnique.h" +#include "gltftechnique.h" -#include "TextureVK.h" +#include "texturevk.h" #include diff --git a/applications/_plugins/common/gltf/vulkan/gltfhelpers_vulkan.cpp b/applications/_plugins/common/gltf/vulkan/gltfhelpers_vulkan.cpp index 27ff959ec..0805fee07 100644 --- a/applications/_plugins/common/gltf/vulkan/gltfhelpers_vulkan.cpp +++ b/applications/_plugins/common/gltf/vulkan/gltfhelpers_vulkan.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "glTFHelpers_Vulkan.h" +#include "gltfhelpers_vulkan.h" #include diff --git a/applications/_plugins/common/gltf/vulkan/gltfpbrvk.cpp b/applications/_plugins/common/gltf/vulkan/gltfpbrvk.cpp index b477802fd..fa11fa9ce 100644 --- a/applications/_plugins/common/gltf/vulkan/gltfpbrvk.cpp +++ b/applications/_plugins/common/gltf/vulkan/gltfpbrvk.cpp @@ -24,17 +24,17 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "GltfPbrVK.h" - -#include "DeviceVK.h" -#include "DynamicBufferRingVK.h" -#include "GltfCommon.h" -#include "GltfHelpers.h" -#include "GltfHelpers_Vulkan.h" -#include "ResourceViewHeapsVK.h" -#include "ShaderCompilerHelper.h" -#include "ThreadPool.h" -#include "UploadHeapVK.h" +#include "gltfpbrvk.h" + +#include "devicevk.h" +#include "dynamicbufferringvk.h" +#include "gltfcommon.h" +#include "gltfhelpers.h" +#include "gltfhelpers_vulkan.h" +#include "resourceviewheapsvk.h" +#include "shadercompilerhelper.h" +#include "threadpool.h" +#include "uploadheapvk.h" #include diff --git a/applications/_plugins/common/gltf/vulkan/gltfpbrvk.h b/applications/_plugins/common/gltf/vulkan/gltfpbrvk.h index 0a683319b..77f94398d 100644 --- a/applications/_plugins/common/gltf/vulkan/gltfpbrvk.h +++ b/applications/_plugins/common/gltf/vulkan/gltfpbrvk.h @@ -18,10 +18,10 @@ // THE SOFTWARE. #pragma once -#include "GltfTechnique.h" -//#include "SkyDome.h" +#include "gltftechnique.h" +//#include "skydome.h" -#include "TextureVK.h" +#include "texturevk.h" #include diff --git a/applications/_plugins/common/gltf/vulkan/gltftechnique.cpp b/applications/_plugins/common/gltf/vulkan/gltftechnique.cpp index c09c78b86..29f192cf2 100644 --- a/applications/_plugins/common/gltf/vulkan/gltftechnique.cpp +++ b/applications/_plugins/common/gltf/vulkan/gltftechnique.cpp @@ -18,12 +18,12 @@ // THE SOFTWARE. -#include "GltfTechnique.h" +#include "gltftechnique.h" -#include "GltfCommon.h" +#include "gltfcommon.h" -#include "DynamicBufferRingVK.h" -#include "StaticBufferPoolVK.h" +#include "dynamicbufferringvk.h" +#include "staticbufferpoolvk.h" void GltfTechnique::Draw(VkCommandBuffer cmd_buf) { std::uint32_t dwNodesVisible; diff --git a/applications/_plugins/common/gltf/vulkan/gltftechnique.h b/applications/_plugins/common/gltf/vulkan/gltftechnique.h index 5155b0c28..09b94e6f8 100644 --- a/applications/_plugins/common/gltf/vulkan/gltftechnique.h +++ b/applications/_plugins/common/gltf/vulkan/gltftechnique.h @@ -18,7 +18,7 @@ // THE SOFTWARE. #pragma once -#include "GltfStructures.h" +#include "gltfstructures.h" #include diff --git a/applications/_plugins/common/hpc_compress/cmakelists.txt b/applications/_plugins/common/hpc_compress/cmakelists.txt index 71fb49968..ce9eba920 100644 --- a/applications/_plugins/common/hpc_compress/cmakelists.txt +++ b/applications/_plugins/common/hpc_compress/cmakelists.txt @@ -7,7 +7,7 @@ set(LEGACY_LOCATION ../) target_sources(Plugin_Common_HPCCompress INTERFACE - ${LEGACY_LOCATION}/HPC_Compress.h + ${LEGACY_LOCATION}/hpc_compress.h ) target_include_directories(Plugin_Common_HPCCompress INTERFACE diff --git a/applications/_plugins/common/kernel_def/cmakelists.txt b/applications/_plugins/common/kernel_def/cmakelists.txt index cdab796a1..5247076de 100644 --- a/applications/_plugins/common/kernel_def/cmakelists.txt +++ b/applications/_plugins/common/kernel_def/cmakelists.txt @@ -7,7 +7,7 @@ set(LEGACY_LOCATION ../) target_sources(Plugin_Common_KernelDef INTERFACE - ${LEGACY_LOCATION}/Common_KernelDef.h + ${LEGACY_LOCATION}/common_kerneldef.h ) target_include_directories(Plugin_Common_KernelDef INTERFACE diff --git a/applications/_plugins/common/mipstoqimage.cpp b/applications/_plugins/common/mipstoqimage.cpp index a0ce0fe25..1d555896f 100644 --- a/applications/_plugins/common/mipstoqimage.cpp +++ b/applications/_plugins/common/mipstoqimage.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "MipsToQImage.h" +#include "mipstoqimage.h" #ifndef USE_QT_IMAGELOAD int QImage2MIPS(QImage*, CMIPS*, MipSet*) { @@ -27,7 +27,7 @@ QImage* MIPS2QImage(CMIPS*, MipSet*, int, int, CMP_CompressOptions, CMP_Feedback return nullptr; // no-op } #else -#include "TextureIO.h" +#include "textureio.h" #include diff --git a/applications/_plugins/common/mipstoqimage.h b/applications/_plugins/common/mipstoqimage.h index 1646f2ec9..7ca03fc89 100644 --- a/applications/_plugins/common/mipstoqimage.h +++ b/applications/_plugins/common/mipstoqimage.h @@ -20,8 +20,8 @@ #ifndef CMP_MIPS_TO_QIMAGE_H_INCLUDE #define CMP_MIPS_TO_QIMAGE_H_INCLUDE -#include -#include +#include +#include // forward declaration class QImage; diff --git a/applications/_plugins/common/misc.cpp b/applications/_plugins/common/misc.cpp index 636737a26..0f9b7187b 100644 --- a/applications/_plugins/common/misc.cpp +++ b/applications/_plugins/common/misc.cpp @@ -17,7 +17,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "Misc.h" +#include "misc.h" #ifndef _WIN32 #include diff --git a/applications/_plugins/common/misc.h b/applications/_plugins/common/misc.h index 068369845..108572f25 100644 --- a/applications/_plugins/common/misc.h +++ b/applications/_plugins/common/misc.h @@ -22,6 +22,6 @@ double MillisecondsNow(); #ifdef _WIN32 -#include +#include SIZE_T Align(SIZE_T uOffset, SIZE_T uAlign); #endif diff --git a/applications/_plugins/common/misc/cmakelists.txt b/applications/_plugins/common/misc/cmakelists.txt index 2f6e2f9d8..1d955e9c6 100644 --- a/applications/_plugins/common/misc/cmakelists.txt +++ b/applications/_plugins/common/misc/cmakelists.txt @@ -7,8 +7,8 @@ set(LEGACY_LOCATION ..) target_sources(Plugin_Common_Misc INTERFACE - ${LEGACY_LOCATION}/Misc.cpp - ${LEGACY_LOCATION}/Misc.h + ${LEGACY_LOCATION}/misc.cpp + ${LEGACY_LOCATION}/misc.h ) target_include_directories(Plugin_Common_Misc INTERFACE diff --git a/applications/_plugins/common/model_viewer/cmakelists.txt b/applications/_plugins/common/model_viewer/cmakelists.txt index e8b635219..7308d50ac 100644 --- a/applications/_plugins/common/model_viewer/cmakelists.txt +++ b/applications/_plugins/common/model_viewer/cmakelists.txt @@ -4,8 +4,8 @@ add_library(Plugin_Common_Model_Viewer INTERFACE) target_sources(Plugin_Common_Model_Viewer INTERFACE - ModelTexture.cpp - ModelTexture.h + modeltexture.cpp + modeltexture.h ) target_include_directories(Plugin_Common_Model_Viewer INTERFACE diff --git a/applications/_plugins/common/model_viewer/modeltexture.cpp b/applications/_plugins/common/model_viewer/modeltexture.cpp index de5433743..2727848ae 100644 --- a/applications/_plugins/common/model_viewer/modeltexture.cpp +++ b/applications/_plugins/common/model_viewer/modeltexture.cpp @@ -17,15 +17,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "ModelTexture.h" +#include "modeltexture.h" -#include "Error.h" -#include "Misc.h" -#include "UtilFuncs.h" +#include "error.h" +#include "misc.h" +#include "utilfuncs.h" -#include "Texture.h" -#include "PluginInterface.h" -#include "TextureIO.h" +#include "texture.h" +#include "plugininterface.h" +#include "textureio.h" #include #include diff --git a/applications/_plugins/common/model_viewer/modeltexture.h b/applications/_plugins/common/model_viewer/modeltexture.h index 7b9c8353c..ca58933ae 100644 --- a/applications/_plugins/common/model_viewer/modeltexture.h +++ b/applications/_plugins/common/model_viewer/modeltexture.h @@ -20,8 +20,8 @@ #ifndef MODELTEXTURE_E467CD76_2A95_402D_B989_A39D10E969E1_H #define MODELTEXTURE_E467CD76_2A95_402D_B989_A39D10E969E1_H -#include -#include +#include +#include #include diff --git a/applications/_plugins/common/modeldata.cpp b/applications/_plugins/common/modeldata.cpp index fe97c24ab..fb15f46e8 100644 --- a/applications/_plugins/common/modeldata.cpp +++ b/applications/_plugins/common/modeldata.cpp @@ -29,9 +29,9 @@ #include #include -#include "ModelData.h" +#include "modeldata.h" #include -#include "TC_PluginInternal.h" +#include "tc_plugininternal.h" diff --git a/applications/_plugins/common/modeldata.h b/applications/_plugins/common/modeldata.h index 2cf02110d..b9d793cea 100644 --- a/applications/_plugins/common/modeldata.h +++ b/applications/_plugins/common/modeldata.h @@ -28,7 +28,7 @@ #define USE_TOOTLE #define USE_MESHOPTIMIZER -#include "TC_PluginAPI.h" +#include "tc_pluginapi.h" #ifdef USE_MESHOPTIMIZER #include "meshoptimizer.h" diff --git a/applications/_plugins/common/pluginbase.h b/applications/_plugins/common/pluginbase.h index eb864fffb..aeda0ea2d 100644 --- a/applications/_plugins/common/pluginbase.h +++ b/applications/_plugins/common/pluginbase.h @@ -29,12 +29,12 @@ #ifndef _PLUGINBASE_H #define _PLUGINBASE_H -#include "Compressonator.h" -#include "Common.h" +#include "compressonator.h" +#include "common.h" #include #ifdef _WIN32 -#include +#include #else typedef int HWND; typedef int* GUID; diff --git a/applications/_plugins/common/plugininterface.h b/applications/_plugins/common/plugininterface.h index 80735e99f..45d00b5f2 100644 --- a/applications/_plugins/common/plugininterface.h +++ b/applications/_plugins/common/plugininterface.h @@ -29,12 +29,12 @@ #ifndef _PLUGININTERFACE_H #define _PLUGININTERFACE_H -#include "Common.h" -#include "Compressonator.h" +#include "common.h" +#include "compressonator.h" -#include "PluginBase.h" -#include "PluginManager.h" -#include "Texture.h" +#include "pluginbase.h" +#include "pluginmanager.h" +#include "texture.h" #define TC_API_VERSION_MAJOR 1 #define TC_API_VERSION_MINOR 4 @@ -116,7 +116,7 @@ class PluginInterface_Filters : PluginBase { virtual ~PluginInterface_Filters() {} virtual int TC_PluginSetSharedIO(void* Shared) = 0; virtual int TC_PluginGetVersion(TC_PluginVersion* pPluginVersion)=0; - virtual int TC_GenerateMIPLevels(CMP_MipSet * pMipSet, CMP_CFilterParams* FilterParams) = 0; + virtual int TC_CFilter(CMP_MipSet* pMipSet, CMP_MipSet* pMipSetDst, CMP_CFilterParams* FilterParams) = 0; }; diff --git a/applications/_plugins/common/pluginmanager.cpp b/applications/_plugins/common/pluginmanager.cpp index a5b5a5d1c..ff6b2f178 100644 --- a/applications/_plugins/common/pluginmanager.cpp +++ b/applications/_plugins/common/pluginmanager.cpp @@ -24,8 +24,8 @@ /// \brief Declares the interface to the Compressonator & ArchitectMF SDK //===================================================================== -#include "PluginManager.h" -#include "PluginInterface.h" +#include "pluginmanager.h" +#include "plugininterface.h" // Windows Header Files: #ifdef _WIN32 diff --git a/applications/_plugins/common/pluginmanager.h b/applications/_plugins/common/pluginmanager.h index 76853afad..1df5a142c 100644 --- a/applications/_plugins/common/pluginmanager.h +++ b/applications/_plugins/common/pluginmanager.h @@ -40,8 +40,8 @@ #endif #include -//#include "PluginInterface.h" -#include "PluginBase.h" +//#include "plugininterface.h" +#include "pluginbase.h" #define MAX_PLUGIN_FILENAME_STR 512 diff --git a/applications/_plugins/common/psnr.cpp b/applications/_plugins/common/psnr.cpp index 3df2e99bc..9c11b4e99 100644 --- a/applications/_plugins/common/psnr.cpp +++ b/applications/_plugins/common/psnr.cpp @@ -1,5 +1,5 @@ -#include "PSNR.h" +#include "psnr.h" #include diff --git a/applications/_plugins/common/psnr.h b/applications/_plugins/common/psnr.h index 41a9b94f9..ee8637a5f 100644 --- a/applications/_plugins/common/psnr.h +++ b/applications/_plugins/common/psnr.h @@ -1,5 +1,5 @@ #pragma once -#include "TestReport.h" +#include "testreport.h" #include // for controlling float print precision #include // for standard I/O #include // string to number conversion diff --git a/applications/_plugins/common/qtimgui/cmakelists.txt b/applications/_plugins/common/qtimgui/cmakelists.txt index 53273fac8..deee4789b 100644 --- a/applications/_plugins/common/qtimgui/cmakelists.txt +++ b/applications/_plugins/common/qtimgui/cmakelists.txt @@ -4,9 +4,9 @@ add_library(Plugin_Common_QtImgui_DX12 INTERFACE) target_sources(Plugin_Common_QtImgui_DX12 INTERFACE - ImGUI_DX12.h - ImGui_DX12Renderer.cpp - ImGui_DX12Renderer.h + imgui_dx12.h + imgui_dx12renderer.cpp + imgui_dx12renderer.h ) target_link_libraries(Plugin_Common_QtImgui_DX12 INTERFACE @@ -25,9 +25,9 @@ add_library(Plugin_Common_QtImgui_OpenGL INTERFACE) target_sources(Plugin_Common_QtImgui_OpenGL INTERFACE - ImGUI_OpenGL.h - ImGui_OpenGLRenderer.cpp - ImGui_OpenGLRenderer.h + imgui_opengl.h + imgui_openglrenderer.cpp + imgui_openglrenderer.h # demowindow.cpp # demowindow.h ) diff --git a/applications/_plugins/common/qtimgui/imgui_dx12.h b/applications/_plugins/common/qtimgui/imgui_dx12.h index 5081ff6d3..006efffc3 100644 --- a/applications/_plugins/common/qtimgui/imgui_dx12.h +++ b/applications/_plugins/common/qtimgui/imgui_dx12.h @@ -23,7 +23,7 @@ #ifndef QTIMGUI_H #define QTIMGUI_H -#include "ImGui_DX12Renderer.h" +#include "imgui_dx12renderer.h" #include "QtWidgets/qwidget.h" class QWidget; diff --git a/applications/_plugins/common/qtimgui/imgui_dx12renderer.cpp b/applications/_plugins/common/qtimgui/imgui_dx12renderer.cpp index 9b5f0b72d..88486445f 100644 --- a/applications/_plugins/common/qtimgui/imgui_dx12renderer.cpp +++ b/applications/_plugins/common/qtimgui/imgui_dx12renderer.cpp @@ -22,16 +22,16 @@ // // Copyright(c) 2014 - 2018 Omar Cornut -#include "ImGui_DX12Renderer.h" +#include "imgui_dx12renderer.h" #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include // DirectX #include diff --git a/applications/_plugins/common/qtimgui/imgui_dx12renderer.h b/applications/_plugins/common/qtimgui/imgui_dx12renderer.h index c8885b538..65a0aadff 100644 --- a/applications/_plugins/common/qtimgui/imgui_dx12renderer.h +++ b/applications/_plugins/common/qtimgui/imgui_dx12renderer.h @@ -22,10 +22,10 @@ // #pragma once -#include "CommandListRingDX12.h" -#include "DynamicBufferRingDX12.h" -#include "ResourceViewHeapsDX12.h" -#include "UploadHeapDX12.h" +#include "commandlistringdx12.h" +#include "dynamicbufferringdx12.h" +#include "resourceviewheapsdx12.h" +#include "uploadheapdx12.h" #include "Error.h" #include "Defines.h" diff --git a/applications/_plugins/common/qtimgui/imgui_opengl.h b/applications/_plugins/common/qtimgui/imgui_opengl.h index ece2ab40b..aaa869a88 100644 --- a/applications/_plugins/common/qtimgui/imgui_opengl.h +++ b/applications/_plugins/common/qtimgui/imgui_opengl.h @@ -23,7 +23,7 @@ #ifndef QTIMGUI_H #define QTIMGUI_H -#include "ImGui_OpenGLRenderer.h" +#include "imgui_openglrenderer.h" #include "QtWidgets/qwidget.h" class QImGUI_OpenGLWidgetWindowWrapper : public QImGUI_OpenGLWindowWrapper { diff --git a/applications/_plugins/common/qtimgui/imgui_openglrenderer.cpp b/applications/_plugins/common/qtimgui/imgui_openglrenderer.cpp index 5dad16983..0da243dc3 100644 --- a/applications/_plugins/common/qtimgui/imgui_openglrenderer.cpp +++ b/applications/_plugins/common/qtimgui/imgui_openglrenderer.cpp @@ -22,13 +22,13 @@ // // Copyright(c) 2014 - 2018 Omar Cornut -#include "ImGui_OpenGLRenderer.h" +#include "imgui_openglrenderer.h" #include -#include +#include #include -#include -#include -#include +#include +#include +#include namespace qtimgui_opengl { QHash keyMap = { diff --git a/applications/_plugins/common/query_timer.h b/applications/_plugins/common/query_timer.h index db74e430b..18b8863c2 100644 --- a/applications/_plugins/common/query_timer.h +++ b/applications/_plugins/common/query_timer.h @@ -44,8 +44,8 @@ typedef timeval cmp_timeval; #define QUERY_PERFORMANCE(label) #endif -#include "Compressonator.h" -#include "Common.h" +#include "compressonator.h" +#include "common.h" struct query_timer { static void initialize() { diff --git a/applications/_plugins/common/ssim.cpp b/applications/_plugins/common/ssim.cpp index 75cad3090..fad747d91 100644 --- a/applications/_plugins/common/ssim.cpp +++ b/applications/_plugins/common/ssim.cpp @@ -71,8 +71,8 @@ the use of this software, even if advised of the possibility of such damage. ======================================================================================== */ -#include "TestReport.h" -#include "SSIM.h" +#include "testreport.h" +#include "ssim.h" void getMSE_PSNR( const Mat& I1, const Mat& I2, double &mse, double &psnr) { Mat s1; diff --git a/applications/_plugins/common/ssim.h b/applications/_plugins/common/ssim.h index 3e34018b9..a0eb175f5 100644 --- a/applications/_plugins/common/ssim.h +++ b/applications/_plugins/common/ssim.h @@ -24,9 +24,9 @@ #pragma once #endif // _MSC_VER > 1000 -#include +#include -#include +#include #include diff --git a/applications/_plugins/common/tc_pluginapi.h b/applications/_plugins/common/tc_pluginapi.h index 64fc94b98..431c555c3 100644 --- a/applications/_plugins/common/tc_pluginapi.h +++ b/applications/_plugins/common/tc_pluginapi.h @@ -35,13 +35,13 @@ #define _TC_PLUGINAPI_INCLUDED_ #ifdef _WIN32 -#include +#include #include #endif #include -#include "PluginInterface.h" +#include "plugininterface.h" #ifdef __cplusplus extern "C" { @@ -148,9 +148,9 @@ typedef enum { TC_VM_Diff, } TC_ViewMode; -#include "Texture.h" +#include "texture.h" #ifdef _WIN32 -#include "TC_PluginInternal.h" +#include "tc_plugininternal.h" #endif //static const TCHAR TC_Property_BitsPerPixel[] = _T("BitsPerPixel"); diff --git a/applications/_plugins/common/tc_plugininternal.cpp b/applications/_plugins/common/tc_plugininternal.cpp index db3463747..677a73e74 100644 --- a/applications/_plugins/common/tc_plugininternal.cpp +++ b/applications/_plugins/common/tc_plugininternal.cpp @@ -26,8 +26,8 @@ // -#include "TC_PluginAPI.h" -#include "Version.h" +#include "tc_pluginapi.h" +#include "version.h" #include #ifdef _WIN32 diff --git a/applications/_plugins/common/tc_plugininternal.h b/applications/_plugins/common/tc_plugininternal.h index 49d247fa3..4826be455 100644 --- a/applications/_plugins/common/tc_plugininternal.h +++ b/applications/_plugins/common/tc_plugininternal.h @@ -40,9 +40,9 @@ #include #endif -#include "Compressonator.h" -#include "Common.h" -#include "TC_PluginAPI.h" +#include "compressonator.h" +#include "common.h" +#include "tc_pluginapi.h" #if _MSC_VER > 1000 #pragma once diff --git a/applications/_plugins/common/test_report/cmakelists.txt b/applications/_plugins/common/test_report/cmakelists.txt index 5b53c135d..9c18836b1 100644 --- a/applications/_plugins/common/test_report/cmakelists.txt +++ b/applications/_plugins/common/test_report/cmakelists.txt @@ -7,7 +7,7 @@ set(LEGACY_LOCATION ../) target_sources(Plugin_Common_TestReport INTERFACE - ${LEGACY_LOCATION}/TestReport.h + ${LEGACY_LOCATION}/testreport.h ) target_include_directories(Plugin_Common_TestReport INTERFACE diff --git a/applications/_plugins/common/texture.h b/applications/_plugins/common/texture.h index 7dc5a5111..79b8f8d9f 100644 --- a/applications/_plugins/common/texture.h +++ b/applications/_plugins/common/texture.h @@ -21,7 +21,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "PluginInterface.h" +#include "plugininterface.h" #ifdef __cplusplus extern "C" { diff --git a/applications/_plugins/common/textureio.cpp b/applications/_plugins/common/textureio.cpp index b421ab236..e28d6ed35 100644 --- a/applications/_plugins/common/textureio.cpp +++ b/applications/_plugins/common/textureio.cpp @@ -25,22 +25,22 @@ // //===================================================================== -#include "TextureIO.h" +#include "textureio.h" -#include "Compressonator.h" -#include "Common.h" -#include "CMP_FileIO.h" -#include "PluginManager.h" -#include "PluginInterface.h" +#include "compressonator.h" +#include "common.h" +#include "cmp_fileio.h" +#include "pluginmanager.h" +#include "plugininterface.h" -#include +#include #if defined(WIN32) && !defined(NO_LEGACY_BEHAVIOR) #define USE_QT_IMAGELOAD #endif #ifdef USE_QT_IMAGELOAD -#include +#include #include #include #include diff --git a/applications/_plugins/common/textureio.h b/applications/_plugins/common/textureio.h index 5afa882cc..2cecada18 100644 --- a/applications/_plugins/common/textureio.h +++ b/applications/_plugins/common/textureio.h @@ -28,9 +28,9 @@ #ifndef TEXTUREIO_H_ #define TEXTUREIO_H_ -#include "Compressonator.h" -#include "Common.h" -#include "Texture.h" +#include "compressonator.h" +#include "common.h" +#include "texture.h" #include diff --git a/applications/_plugins/common/userinterface.cpp b/applications/_plugins/common/userinterface.cpp index cfca620d3..5add54b42 100644 --- a/applications/_plugins/common/userinterface.cpp +++ b/applications/_plugins/common/userinterface.cpp @@ -1,4 +1,4 @@ -#include "UserInterface.h" +#include "userinterface.h" UserInterface::UserInterface() { xRotation = 0.0f; diff --git a/applications/_plugins/common/util_funcs/cmakelists.txt b/applications/_plugins/common/util_funcs/cmakelists.txt index c58227734..360ef46e6 100644 --- a/applications/_plugins/common/util_funcs/cmakelists.txt +++ b/applications/_plugins/common/util_funcs/cmakelists.txt @@ -7,8 +7,8 @@ set(LEGACY_LOCATION ../) target_sources(Plugin_Common_UtilFuncs INTERFACE - ${LEGACY_LOCATION}/UtilFuncs.cpp - ${LEGACY_LOCATION}/UtilFuncs.h + ${LEGACY_LOCATION}/utilfuncs.cpp + ${LEGACY_LOCATION}/utilfuncs.h ) target_include_directories(Plugin_Common_UtilFuncs INTERFACE diff --git a/applications/_plugins/common/utilfuncs.cpp b/applications/_plugins/common/utilfuncs.cpp index 08c4fe8f3..47a7a9bf8 100644 --- a/applications/_plugins/common/utilfuncs.cpp +++ b/applications/_plugins/common/utilfuncs.cpp @@ -24,7 +24,7 @@ // UtilFuncs.cpp : Source file for utility functions // -#include "UtilFuncs.h" +#include "utilfuncs.h" #ifndef ASSERT #include @@ -33,7 +33,7 @@ #ifdef _WIN32 // Windows Header Files: -#include +#include #include #include #include diff --git a/applications/_plugins/common/utilfuncs.h b/applications/_plugins/common/utilfuncs.h index 1ce8efc7e..8fd60c848 100644 --- a/applications/_plugins/common/utilfuncs.h +++ b/applications/_plugins/common/utilfuncs.h @@ -30,7 +30,7 @@ #include #ifdef _WIN32 -#include +#include #include #include #include diff --git a/applications/_plugins/gltf/cmakelists.txt b/applications/_plugins/gltf/cmakelists.txt index 102eebf62..334625018 100644 --- a/applications/_plugins/gltf/cmakelists.txt +++ b/applications/_plugins/gltf/cmakelists.txt @@ -3,19 +3,19 @@ add_library(Plugin_GLTF) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../Common) +set(LEGACY_LOCATION ../common) target_sources(Plugin_GLTF PRIVATE ${LEGACY_LOCATION}/gltf/defines.h - ${LEGACY_LOCATION}/gltf/Error.cpp - ${LEGACY_LOCATION}/gltf/Error.h - ${LEGACY_LOCATION}/gltf/GltfCommon.cpp - ${LEGACY_LOCATION}/gltf/GltfCommon.h - ${LEGACY_LOCATION}/gltf/GltfFeatures.h - ${LEGACY_LOCATION}/gltf/glTFHelpers.cpp - ${LEGACY_LOCATION}/gltf/glTFHelpers.h - ${LEGACY_LOCATION}/gltf/GltfStructures.h + ${LEGACY_LOCATION}/gltf/error.cpp + ${LEGACY_LOCATION}/gltf/error.h + ${LEGACY_LOCATION}/gltf/gltfcommon.cpp + ${LEGACY_LOCATION}/gltf/gltfcommon.h + ${LEGACY_LOCATION}/gltf/gltffeatures.h + ${LEGACY_LOCATION}/gltf/gltfhelpers.cpp + ${LEGACY_LOCATION}/gltf/gltfhelpers.h + ${LEGACY_LOCATION}/gltf/gltfstructures.h ${LEGACY_LOCATION}/gltf/stb_image_write.h ${LEGACY_LOCATION}/gltf/stb_image.h ${LEGACY_LOCATION}/gltf/tiny_gltf2_utils.cpp @@ -46,5 +46,8 @@ target_include_directories(Plugin_GLTF set_target_properties(Plugin_GLTF PROPERTIES FOLDER ${FOLDER_NAME}) -add_subdirectory(DX12) -add_subdirectory(Vulkan) +if (OPTION_CMP_DIRECTX) +add_subdirectory(dx12) +endif() + +add_subdirectory(vulkan) diff --git a/applications/_plugins/gltf/dx12/cmakelists.txt b/applications/_plugins/gltf/dx12/cmakelists.txt index 2742dfe3f..e4b91b578 100644 --- a/applications/_plugins/gltf/dx12/cmakelists.txt +++ b/applications/_plugins/gltf/dx12/cmakelists.txt @@ -2,22 +2,22 @@ add_library(Plugin_GLTF_DX12 INTERFACE) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../../Common/gltf/DX12) +set(LEGACY_LOCATION ../../common/gltf/dx12) target_sources(Plugin_GLTF_DX12 INTERFACE - ${LEGACY_LOCATION}/GltfBBoxPass.cpp - ${LEGACY_LOCATION}/GltfBBoxPass.h - ${LEGACY_LOCATION}/GltfDepthPass.cpp - ${LEGACY_LOCATION}/GltfDepthPass.h - ${LEGACY_LOCATION}/GltfPbr.cpp - ${LEGACY_LOCATION}/GltfPbr.h - ${LEGACY_LOCATION}/GltfTechnique.cpp - ${LEGACY_LOCATION}/GltfTechnique.h - ${LEGACY_LOCATION}/glTFHelpers_DX12.cpp - ${LEGACY_LOCATION}/glTFHelpers_DX12.h - ${LEGACY_LOCATION}/gltfGetFormat_DX12.cpp - ${LEGACY_LOCATION}/gltfGetFormat_DX12.h + ${LEGACY_LOCATION}/gltfbboxpass.cpp + ${LEGACY_LOCATION}/gltfbboxpass.h + ${LEGACY_LOCATION}/gltfdepthpass.cpp + ${LEGACY_LOCATION}/gltfdepthpass.h + ${LEGACY_LOCATION}/gltfpbr.cpp + ${LEGACY_LOCATION}/gltfpbr.h + ${LEGACY_LOCATION}/gltftechnique.cpp + ${LEGACY_LOCATION}/gltftechnique.h + ${LEGACY_LOCATION}/gltfhelpers_dx12.cpp + ${LEGACY_LOCATION}/gltfhelpers_dx12.h + ${LEGACY_LOCATION}/gltfgetformat_dx12.cpp + ${LEGACY_LOCATION}/gltfgetformat_dx12.h ) target_include_directories(Plugin_GLTF_DX12 INTERFACE diff --git a/applications/_plugins/gltf/vulkan/cmakelists.txt b/applications/_plugins/gltf/vulkan/cmakelists.txt index 91057966a..f8a7809f5 100644 --- a/applications/_plugins/gltf/vulkan/cmakelists.txt +++ b/applications/_plugins/gltf/vulkan/cmakelists.txt @@ -2,20 +2,20 @@ add_library(Plugin_GLTF_Vulkan INTERFACE) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../../Common/gltf/Vulkan) +set(LEGACY_LOCATION ../../common/gltf/vulkan) target_sources(Plugin_GLTF_Vulkan INTERFACE - ${LEGACY_LOCATION}/GltfBBoxPassVK.cpp - ${LEGACY_LOCATION}/GltfBBoxPassVK.h - ${LEGACY_LOCATION}/GltfDepthPassVK.cpp - ${LEGACY_LOCATION}/GltfDepthPassVK.h - ${LEGACY_LOCATION}/GltfPbrVK.cpp - ${LEGACY_LOCATION}/GltfPbrVK.h - ${LEGACY_LOCATION}/GltfTechnique.cpp - ${LEGACY_LOCATION}/GltfTechnique.h - ${LEGACY_LOCATION}/glTFHelpers_Vulkan.cpp - ${LEGACY_LOCATION}/glTFHelpers_Vulkan.h + ${LEGACY_LOCATION}/gltfbboxpassvk.cpp + ${LEGACY_LOCATION}/gltfbboxpassvk.h + ${LEGACY_LOCATION}/gltfdepthpassvk.cpp + ${LEGACY_LOCATION}/gltfdepthpassvk.h + ${LEGACY_LOCATION}/gltfpbrvk.cpp + ${LEGACY_LOCATION}/gltfpbrvk.h + ${LEGACY_LOCATION}/gltftechnique.cpp + ${LEGACY_LOCATION}/gltftechnique.h + ${LEGACY_LOCATION}/gltfhelpers_vulkan.cpp + ${LEGACY_LOCATION}/gltfhelpers_vulkan.h ) target_include_directories(Plugin_GLTF_Vulkan INTERFACE diff --git a/applications/_plugins/half/cmakelists.txt b/applications/_plugins/half/cmakelists.txt index e3da85d6e..407a5316b 100644 --- a/applications/_plugins/half/cmakelists.txt +++ b/applications/_plugins/half/cmakelists.txt @@ -2,17 +2,17 @@ add_library(Plugin_Half) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../../../CMP_Framework/Common/half) +set(LEGACY_LOCATION ../../../cmp_framework/common/half) target_sources(Plugin_Half PRIVATE - ${LEGACY_LOCATION}/eLut.h + ${LEGACY_LOCATION}/elut.h ${LEGACY_LOCATION}/half.cpp ${LEGACY_LOCATION}/half.h - ${LEGACY_LOCATION}/halfExport.h - ${LEGACY_LOCATION}/halfFunction.h - ${LEGACY_LOCATION}/halfLimits.h - ${LEGACY_LOCATION}/toFloat.h + ${LEGACY_LOCATION}/halfexport.h + ${LEGACY_LOCATION}/halffunction.h + ${LEGACY_LOCATION}/halflimits.h + ${LEGACY_LOCATION}/tofloat.h ) target_include_directories(Plugin_Half PUBLIC diff --git a/applications/_plugins/json/cmakelists.txt b/applications/_plugins/json/cmakelists.txt index 52479acc9..5f659b350 100644 --- a/applications/_plugins/json/cmakelists.txt +++ b/applications/_plugins/json/cmakelists.txt @@ -3,7 +3,7 @@ add_library(Plugin_Json INTERFACE) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../Common) +set(LEGACY_LOCATION ../common) target_sources(Plugin_Json INTERFACE diff --git a/applications/_plugins/modelviewer/cmakelists.txt b/applications/_plugins/modelviewer/cmakelists.txt index d7ec62e95..29327f045 100644 --- a/applications/_plugins/modelviewer/cmakelists.txt +++ b/applications/_plugins/modelviewer/cmakelists.txt @@ -3,12 +3,12 @@ add_library(Plugin_Model_Viewer) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../Common/model_viewer) +set(LEGACY_LOCATION ../common/model_viewer) target_sources(Plugin_Model_Viewer PRIVATE - ${LEGACY_LOCATION}/ModelTexture.cpp - ${LEGACY_LOCATION}/ModelTexture.h + ${LEGACY_LOCATION}/modeltexture.cpp + ${LEGACY_LOCATION}/modeltexture.h ) target_include_directories(Plugin_Model_Viewer PUBLIC diff --git a/applications/_plugins/pluginmanager/cmakelists.txt b/applications/_plugins/pluginmanager/cmakelists.txt index 2a08977d8..49d38bee6 100644 --- a/applications/_plugins/pluginmanager/cmakelists.txt +++ b/applications/_plugins/pluginmanager/cmakelists.txt @@ -3,24 +3,24 @@ add_library(Plugin_PluginManager) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../Common) +set(LEGACY_LOCATION ../common) target_sources(Plugin_PluginManager PRIVATE - ${LEGACY_LOCATION}/PluginBase.h - ${LEGACY_LOCATION}/PluginInterface.h - ${LEGACY_LOCATION}/PluginManager.cpp - ${LEGACY_LOCATION}/PluginManager.h - ${LEGACY_LOCATION}/Texture.h + ${LEGACY_LOCATION}/pluginbase.h + ${LEGACY_LOCATION}/plugininterface.h + ${LEGACY_LOCATION}/pluginmanager.cpp + ${LEGACY_LOCATION}/pluginmanager.h + ${LEGACY_LOCATION}/texture.h ) target_include_directories(Plugin_PluginManager PUBLIC ./ ${LEGACY_LOCATION} - ${PROJECT_SOURCE_DIR}/CMP_CompressonatorLib - ${PROJECT_SOURCE_DIR}/CMP_Framework/Common - ${PROJECT_SOURCE_DIR}/CMP_Framework/Common/half + ${PROJECT_SOURCE_DIR}/cmp_compressonatorlib + ${PROJECT_SOURCE_DIR}/cmp_framework/common + ${PROJECT_SOURCE_DIR}/cmp_framework/common/half ) target_link_libraries(Plugin_PluginManager diff --git a/applications/_plugins/psnr/cmakelists.txt b/applications/_plugins/psnr/cmakelists.txt index 3d90d60e5..503f6199f 100644 --- a/applications/_plugins/psnr/cmakelists.txt +++ b/applications/_plugins/psnr/cmakelists.txt @@ -3,21 +3,21 @@ add_library(Plugin_PSNR) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../Common) +set(LEGACY_LOCATION ../common) target_sources(Plugin_PSNR PRIVATE - ${LEGACY_LOCATION}/PSNR.cpp - ${LEGACY_LOCATION}/PSNR.h - ${LEGACY_LOCATION}/SSIM.cpp - ${LEGACY_LOCATION}/SSIM.h + ${LEGACY_LOCATION}/psnr.cpp + ${LEGACY_LOCATION}/psnr.h + ${LEGACY_LOCATION}/ssim.cpp + ${LEGACY_LOCATION}/ssim.h ) target_include_directories(Plugin_PSNR PUBLIC ./ ${LEGACY_LOCATION} - ${PROJECT_SOURCE_DIR}/CMP_CompressonatorLib - ${PROJECT_SOURCE_DIR}/CMP_Framework/Common - ${PROJECT_SOURCE_DIR}/CMP_Framework/Common/half + ${PROJECT_SOURCE_DIR}/cmp_compressonatorlib + ${PROJECT_SOURCE_DIR}/cmp_framework/common + ${PROJECT_SOURCE_DIR}/cmp_framework/common/half ) target_link_libraries(Plugin_PSNR PRIVATE diff --git a/applications/_plugins/tcpluginapi/cmakelists.txt b/applications/_plugins/tcpluginapi/cmakelists.txt index 7406f4620..278a7ee4a 100644 --- a/applications/_plugins/tcpluginapi/cmakelists.txt +++ b/applications/_plugins/tcpluginapi/cmakelists.txt @@ -3,14 +3,14 @@ add_library(Plugin_TCPluginAPI) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../Common) +set(LEGACY_LOCATION ../common) target_sources(Plugin_TCPluginAPI PRIVATE - ${LEGACY_LOCATION}/ModelData.cpp - ${LEGACY_LOCATION}/ModelData.h - ${LEGACY_LOCATION}/TC_PluginAPI.h - ${LEGACY_LOCATION}/TC_PluginInternal.cpp - ${LEGACY_LOCATION}/TC_PluginInternal.h + ${LEGACY_LOCATION}/modeldata.cpp + ${LEGACY_LOCATION}/modeldata.h + ${LEGACY_LOCATION}/tc_pluginapi.h + ${LEGACY_LOCATION}/tc_plugininternal.cpp + ${LEGACY_LOCATION}/tc_plugininternal.h ) target_include_directories(Plugin_TCPluginAPI PUBLIC diff --git a/applications/_plugins/userinterface/cmakelists.txt b/applications/_plugins/userinterface/cmakelists.txt index 6c8b7ec63..356a671c8 100644 --- a/applications/_plugins/userinterface/cmakelists.txt +++ b/applications/_plugins/userinterface/cmakelists.txt @@ -3,12 +3,12 @@ add_library(Plugin_UserInterface) # This is the current location of these files. They should be moved here -set(LEGACY_LOCATION ../Common) +set(LEGACY_LOCATION ../common) target_sources(Plugin_UserInterface PRIVATE - ${LEGACY_LOCATION}/UserInterface.h - ${LEGACY_LOCATION}/UserInterface.cpp + ${LEGACY_LOCATION}/userinterface.h + ${LEGACY_LOCATION}/userinterface.cpp ) target_include_directories(Plugin_UserInterface PUBLIC diff --git a/applications/cmakelists.txt b/applications/cmakelists.txt index 400641651..e376d756d 100644 --- a/applications/cmakelists.txt +++ b/applications/cmakelists.txt @@ -1,5 +1,9 @@ set(FOLDER_NAME Applications) -add_subdirectory(CompressonatorCLI) -add_subdirectory(CompressonatorGUI) +add_subdirectory(compressonatorcli) + +#enable when code is clean for Linux support +if (OPTION_BUILD_GUI) +add_subdirectory(compressonatorgui) +endif() diff --git a/applications/compressonatorcli/cmakelists.txt b/applications/compressonatorcli/cmakelists.txt index 6f1cd71e8..85bd0b1fc 100644 --- a/applications/compressonatorcli/cmakelists.txt +++ b/applications/compressonatorcli/cmakelists.txt @@ -3,15 +3,25 @@ message(STATUS "++++++++++++++++++ CLI link_directories ${CMAKE_CURRENT_LIST_DIR # this must be before add_executable link_directories( ${PROJECT_SOURCE_DIR}/../common/lib/ext/opencv/2.49/x64/VS2015/lib - ${PROJECT_SOURCE_DIR}/../common/lib/ext/directxtex/DirectXTex-jun2020b/DirectXTex/Bin/Desktop_2017/x64 ${PROJECT_SOURCE_DIR}/../common/lib/ext/zlib/zlib-1.2.10/VS2015/x64/lib ${PROJECT_SOURCE_DIR}/../common/lib/ext/openexr/ilmbase-2.2.0/VS2015/x64/lib ${PROJECT_SOURCE_DIR}/../common/lib/ext/openexr/openexr-2.2.0/VS2015/x64/lib - ${PROJECT_SOURCE_DIR}/../common/lib/ext/glew/1.9.0/lib/x64 ) + ${PROJECT_SOURCE_DIR}/../common/lib/ext/glew/1.9.0/lib/x64 + ) + + +# this must be before add_executable +if (OPTION_CMP_DIRECTX) +link_directories( + ${PROJECT_SOURCE_DIR}/../common/lib/ext/directxtex/DirectXTex-jun2020b/DirectXTex/Bin/Desktop_2017/x64 + ) +endif() add_executable(CompressonatorCLI-bin) +if(CMP_HOST_WINDOWS) add_dependencies(CompressonatorCLI-bin extern_ktx) +endif() set_target_properties(CompressonatorCLI-bin PROPERTIES AUTORCC ON @@ -43,22 +53,28 @@ file(GLOB_RECURSE RESOURCES target_sources(CompressonatorCLI-bin PRIVATE ${RESOURCES} - Source/CompressonatorCLI.cpp - Source/CompressonatorCLI_Documentation.h + source/compressonatorcli.cpp + source/compressonatorcli_documentation.h ) target_include_directories(CompressonatorCLI-bin PRIVATE - ${PROJECT_SOURCE_DIR}/CMP_CompressonatorLib - ./Source + ${PROJECT_SOURCE_DIR}/cmp_compressonatorlib + ./source +) + +if (OPTION_CMP_DIRECTX) +target_link_libraries(CompressonatorCLI-bin + PRIVATE + # Static Libs + ExtDirectXTex ) +endif() target_link_libraries(CompressonatorCLI-bin PRIVATE # Static Libs ExtKTX ExtGLEW -# ExtOpenEXR - ExtDirectXTex CMP_FileIO CMP_Core CMP_FrameworkLIB @@ -80,18 +96,41 @@ target_link_libraries(CompressonatorCLI-bin Plugin_CAnalysis ) -if (OPTION_USE_QT_IMAGELOAD) - target_link_libraries(CompressonatorCLI-bin - PRIVATE - ExtQt5 - ) -endif() + +target_link_libraries(CompressonatorCLI-bin + PRIVATE + # Static Libs + ExtKTX + ExtGLEW + CMP_FileIO + CMP_Core + CMP_FrameworkLIB + CMP_MeshCompressor + CMP_MeshOptimizer + CompressonatorLIB + GPU_Decode + # Static "plugin" Libs + Plugin_C3DModel_Loaders + Plugin_CCMP_Encode + Plugin_CCMP_SDK + Plugin_CGPUDecode + Plugin_CmdLine + Plugin_CMesh_Mesh_Optimizer + Plugin_Common_QueryPerformance + Plugin_GLTF + # Dynamic plugins + Plugin_CImage + Plugin_CAnalysis + + ExtQt5 + ExtQt5Widgets +) if (OPTION_BUILD_TESTING) - add_subdirectory(Tests) + add_subdirectory(tests) endif() -include(CopyFiles.cmake) +include(copyfiles.cmake) set_target_properties(CompressonatorCLI-bin PROPERTIES FOLDER ${FOLDER_NAME}) @@ -101,18 +140,18 @@ if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") USE_SOURCE_PERMISSIONS PATTERN "cmake_install.cmake" EXCLUDE PATTERN "CMakeFiles*" EXCLUDE - PATTERN "CTestTestfile.cmake" EXCLUDE - PATTERN "Makefile" EXCLUDE - PATTERN "Tests*" EXCLUDE + PATTERN "ctesttestfile.cmake" EXCLUDE + PATTERN "makefile" EXCLUDE + PATTERN "tests*" EXCLUDE ) elseif (CMAKE_GENERATOR STREQUAL "Visual Studio 16 2019") install(DIRECTORY "$" - DESTINATION "./CompressonatorCLI" + DESTINATION "./compressonatorcli" USE_SOURCE_PERMISSIONS ) elseif (CMAKE_GENERATOR STREQUAL "Xcode") install(DIRECTORY "$" - DESTINATION "./CompressonatorCLI" + DESTINATION "./compressonatorcli" USE_SOURCE_PERMISSIONS ) endif() diff --git a/applications/compressonatorcli/resources/mainapp.rc b/applications/compressonatorcli/resources/mainapp.rc index 53d10ac3bbe395e82634d0b0603ba6fa6bc15b15..18db776f17ef439dd12b2e48dfe4ef88f8e8dd6f 100644 GIT binary patch delta 26 hcmdm{xJ_|F9A`2^E<*uBJVWwiM`mfpoQ=)K0sw5A2Yvtm delta 24 fcmdm{xJ_|F9J@1vFGB!B{A7D(Sw^3Y&Bg)%S!f2C diff --git a/applications/compressonatorcli/source/compressonatorcli.cpp b/applications/compressonatorcli/source/compressonatorcli.cpp index 677218b27..10682b442 100644 --- a/applications/compressonatorcli/source/compressonatorcli.cpp +++ b/applications/compressonatorcli/source/compressonatorcli.cpp @@ -30,9 +30,9 @@ #endif #include "cmdline.h" -#include "PluginManager.h" -#include "TextureIO.h" -#include "Version.h" +#include "pluginmanager.h" +#include "textureio.h" +#include "version.h" #if defined(WIN32) && !defined(NO_LEGACY_BEHAVIOR) #define USE_QT_IMAGELOAD diff --git a/applications/compressonatorcli/tests/cmakelists.txt b/applications/compressonatorcli/tests/cmakelists.txt index 890446c30..01e2ab1af 100644 --- a/applications/compressonatorcli/tests/cmakelists.txt +++ b/applications/compressonatorcli/tests/cmakelists.txt @@ -1,7 +1,7 @@ # Setup test environment set(TESTS_WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}) file(MAKE_DIRECTORY ${TESTS_WORKING_DIR}) -file(GLOB CMP_CLI_TEST_COMPONENTS "${CMAKE_CURRENT_LIST_DIR}/../../../RunTime/*" LIST_DIRECTORIES true) +file(GLOB CMP_CLI_TEST_COMPONENTS "${CMAKE_CURRENT_LIST_DIR}/../../../runtime/*" LIST_DIRECTORIES true) foreach(CMP_TEST_FILE ${CMP_CLI_TEST_COMPONENTS}) get_filename_component(_CMP_TEST_FILE_NAME ${CMP_TEST_FILE} NAME) file(COPY ${CMP_TEST_FILE} DESTINATION ${TESTS_WORKING_DIR}) diff --git a/applications/compressonatorgui/cmakelists.txt b/applications/compressonatorgui/cmakelists.txt index affa0433d..6cc87f174 100644 --- a/applications/compressonatorgui/cmakelists.txt +++ b/applications/compressonatorgui/cmakelists.txt @@ -1,8 +1,13 @@ # Compressonator GUI # this must be before add_executable +if (OPTION_CMP_DIRECTX ) link_directories( - ${PROJECT_SOURCE_DIR}/../common/lib/ext/opencv/2.49/x64/VS2015/lib ${PROJECT_SOURCE_DIR}/../common/lib/ext/directxtex/DirectXTex-jun2020b/DirectXTex/Bin/Desktop_2017/x64 + ) +endif() + +link_directories( + ${PROJECT_SOURCE_DIR}/../common/lib/ext/opencv/2.49/x64/VS2015/lib ${PROJECT_SOURCE_DIR}/../common/lib/ext/zlib/zlib-1.2.10/VS2015/x64/lib ${PROJECT_SOURCE_DIR}/../common/lib/ext/openexr/ilmbase-2.2.0/VS2015/x64/lib ${PROJECT_SOURCE_DIR}/../common/lib/ext/openexr/openexr-2.2.0/VS2015/x64/lib @@ -11,15 +16,17 @@ link_directories( # Enable automoc and autorcc set(CMAKE_INCLUDE_CURRENT_DIR ON) -add_subdirectory(Common) -add_subdirectory(Components) -add_subdirectory(GeneratedFiles) -add_subdirectory(QPropertyPages) +add_subdirectory(common) +add_subdirectory(components) +add_subdirectory(generatedfiles) +add_subdirectory(qpropertypages) # Compressonator GUI Application add_executable(CompressonatorGUI-bin) -add_dependencies(CompressonatorGUI-bin extern_ktx) +if (CMP_HOST_WINDOWS) + add_dependencies(CompressonatorGUI-bin extern_ktx) +endif() set_target_properties(CompressonatorGUI-bin PROPERTIES AUTOMOC ON @@ -29,7 +36,7 @@ set_target_properties(CompressonatorGUI-bin PROPERTIES ) # Find the QtWidgets library -find_package(Qt5 REQUIRED COMPONENTS Core Widgets) +find_package(Qt5 REQUIRED COMPONENTS Core Widgets HINTS ${QT_PACKAGE_ROOT}) if(CMP_HOST_WINDOWS) set_target_properties(CompressonatorGUI-bin PROPERTIES @@ -64,13 +71,13 @@ target_sources(CompressonatorGUI-bin PRIVATE ${SRCS} ${RESOURCES} - CompressonatorGUI.qrc + compressonatorgui.qrc ) target_include_directories(CompressonatorGUI-bin PRIVATE - ${PROJECT_SOURCE_DIR}/CMP_CompressonatorLib - ./Resources - ./Source + ${PROJECT_SOURCE_DIR}/cmp_compressonatorlib + ./resources + ./source ) target_link_libraries(CompressonatorGUI-bin @@ -103,7 +110,7 @@ target_link_libraries(CompressonatorGUI-bin Plugin_CMesh ) -include(CopyFiles.cmake) +include(copyfiles.cmake) set_target_properties(CompressonatorGUI-bin PROPERTIES FOLDER ${FOLDER_NAME}) @@ -113,22 +120,22 @@ if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") USE_SOURCE_PERMISSIONS PATTERN "cmake_install.cmake" EXCLUDE PATTERN "CMakeFiles*" EXCLUDE - PATTERN "Common*" EXCLUDE - PATTERN "Components*" EXCLUDE + PATTERN "common*" EXCLUDE + PATTERN "components*" EXCLUDE PATTERN "CompressonatorGUI-bin_autogen*" EXCLUDE - PATTERN "CTestTestfile.cmake" EXCLUDE - PATTERN "GeneratedFiles*" EXCLUDE - PATTERN "Makefile" EXCLUDE - PATTERN "QPropertyPages*" EXCLUDE + PATTERN "ctesttestfile.cmake" EXCLUDE + PATTERN "generatedfiles*" EXCLUDE + PATTERN "makefile" EXCLUDE + PATTERN "qpropertypages*" EXCLUDE ) elseif (CMAKE_GENERATOR STREQUAL "Visual Studio 16 2019") install(DIRECTORY "$" - DESTINATION "./CompressonatorGUI" + DESTINATION "./compressonatorgui" USE_SOURCE_PERMISSIONS ) elseif (CMAKE_GENERATOR STREQUAL "Xcode") install(DIRECTORY "$" - DESTINATION "./CompressonatorGUI" + DESTINATION "./compressonatorgui" USE_SOURCE_PERMISSIONS ) endif() diff --git a/applications/compressonatorgui/common/cmakelists.txt b/applications/compressonatorgui/common/cmakelists.txt index 8a94b840b..e0f95f05a 100644 --- a/applications/compressonatorgui/common/cmakelists.txt +++ b/applications/compressonatorgui/common/cmakelists.txt @@ -1,14 +1,14 @@ add_library(CMP_GUI_BIN_Common INTERFACE) target_sources(CMP_GUI_BIN_Common INTERFACE - cpTreeWidget.cpp + cptreewidget.cpp geometryengine.cpp objectcontroller.cpp ) target_sources(CMP_GUI_BIN_Common INTERFACE - cpTreeWidget.h + cptreewidget.h geometryengine.h objectcontroller.h ) diff --git a/applications/compressonatorgui/common/cptreewidget.cpp b/applications/compressonatorgui/common/cptreewidget.cpp index 11de1d763..8c83fcf98 100644 --- a/applications/compressonatorgui/common/cptreewidget.cpp +++ b/applications/compressonatorgui/common/cptreewidget.cpp @@ -24,8 +24,8 @@ // //===================================================================== -#include "cpTreeWidget.h" -#include "PluginManager.h" +#include "cptreewidget.h" +#include "pluginmanager.h" extern PluginManager g_pluginManager; diff --git a/applications/compressonatorgui/components/ac3dmeshanalysis.cpp b/applications/compressonatorgui/components/ac3dmeshanalysis.cpp index 96d14922c..1e3f73c8d 100644 --- a/applications/compressonatorgui/components/ac3dmeshanalysis.cpp +++ b/applications/compressonatorgui/components/ac3dmeshanalysis.cpp @@ -1,5 +1,5 @@ -#include "ac3DMeshAnalysis.h" -#include "cpProjectView.h" +#include "ac3dmeshanalysis.h" +#include "cpprojectview.h" ac3DMeshAnalysis::ac3DMeshAnalysis(QWidget *parent) diff --git a/applications/compressonatorgui/components/ac3dmeshanalysis.h b/applications/compressonatorgui/components/ac3dmeshanalysis.h index 780c8beb6..312fea8e4 100644 --- a/applications/compressonatorgui/components/ac3dmeshanalysis.h +++ b/applications/compressonatorgui/components/ac3dmeshanalysis.h @@ -2,7 +2,7 @@ #define AC3DMESHANALYSIS_H #include -#include +#include #include #include #include @@ -10,7 +10,7 @@ #include #include #include -#include "ModelData.h" +#include "modeldata.h" #include "meshoptimizer.h" #define DEFAULT_HWVCACHE_SZ 16 diff --git a/applications/compressonatorgui/components/acaboutdlg.cpp b/applications/compressonatorgui/components/acaboutdlg.cpp index cbe5e0e12..d8d555a68 100644 --- a/applications/compressonatorgui/components/acaboutdlg.cpp +++ b/applications/compressonatorgui/components/acaboutdlg.cpp @@ -1,5 +1,5 @@ -#include "acAboutDlg.h" -#include "Version.h" +#include "acaboutdlg.h" +#include "version.h" #define AC_STR_HelpAboutWebPage "http://gpuopen.com/gaming-product/compressonator/" #define AC_STR_HelpAboutWebPageText "gpuopen.com" diff --git a/applications/compressonatorgui/components/acaboutdlg.h b/applications/compressonatorgui/components/acaboutdlg.h index 74c467d27..7d9a8c9c0 100644 --- a/applications/compressonatorgui/components/acaboutdlg.h +++ b/applications/compressonatorgui/components/acaboutdlg.h @@ -1,12 +1,12 @@ #ifndef CPABOUTDLG_H #define CPABOUTDLG_H -#include +#include #include #include #include #include -#include +#include #include class CHelpAboutDialog : public QDialog { diff --git a/applications/compressonatorgui/components/accustomdockwidget.cpp b/applications/compressonatorgui/components/accustomdockwidget.cpp index 22e643355..be5a9b9c6 100644 --- a/applications/compressonatorgui/components/accustomdockwidget.cpp +++ b/applications/compressonatorgui/components/accustomdockwidget.cpp @@ -24,7 +24,7 @@ // //===================================================================== -#include "acCustomDockWidget.h" +#include "accustomdockwidget.h" acCustomDockWidget::acCustomDockWidget(const QString title, QWidget *parent) : QDockWidget(title, parent) { diff --git a/applications/compressonatorgui/components/accustomdockwidget.h b/applications/compressonatorgui/components/accustomdockwidget.h index 1f592a049..6adbab6fa 100644 --- a/applications/compressonatorgui/components/accustomdockwidget.h +++ b/applications/compressonatorgui/components/accustomdockwidget.h @@ -41,7 +41,7 @@ #include #include -#include "acDockWidgetTitleBar.h" +#include "acdockwidgettitlebar.h" class acCustomDockWidget : public QDockWidget { diff --git a/applications/compressonatorgui/components/accustomgraphics.cpp b/applications/compressonatorgui/components/accustomgraphics.cpp index 286fbb6dc..948fba098 100644 --- a/applications/compressonatorgui/components/accustomgraphics.cpp +++ b/applications/compressonatorgui/components/accustomgraphics.cpp @@ -24,7 +24,7 @@ // //===================================================================== -#include "acCustomGraphics.h" +#include "accustomgraphics.h" //========================================= // Graphics View diff --git a/applications/compressonatorgui/components/accustomgraphics.h b/applications/compressonatorgui/components/accustomgraphics.h index 56f63b066..548b8897f 100644 --- a/applications/compressonatorgui/components/accustomgraphics.h +++ b/applications/compressonatorgui/components/accustomgraphics.h @@ -33,7 +33,7 @@ #include #include #include -#include "cpProjectData.h" +#include "cpprojectdata.h" extern C_Application_Options g_Application_Options; diff --git a/applications/compressonatorgui/components/acdiffimage.cpp b/applications/compressonatorgui/components/acdiffimage.cpp index 15f9bf16f..829252dcf 100644 --- a/applications/compressonatorgui/components/acdiffimage.cpp +++ b/applications/compressonatorgui/components/acdiffimage.cpp @@ -1,5 +1,5 @@ #include "acDiffImage.h" -#include "cpProjectView.h" +#include "cpprojectview.h" acDiffImage::acDiffImage(QWidget *parent) : QDialog(parent) { m_parent = parent; diff --git a/applications/compressonatorgui/components/acdockwidgettitlebar.cpp b/applications/compressonatorgui/components/acdockwidgettitlebar.cpp index d35239455..e7b7ff20d 100644 --- a/applications/compressonatorgui/components/acdockwidgettitlebar.cpp +++ b/applications/compressonatorgui/components/acdockwidgettitlebar.cpp @@ -24,7 +24,7 @@ // //===================================================================== -#include "acDockWidgetTitleBar.h" +#include "acdockwidgettitlebar.h" acDockWidgetTitlebar::acDockWidgetTitlebar(QWidget *parent) : parent(parent) { diff --git a/applications/compressonatorgui/components/acexrtool.cpp b/applications/compressonatorgui/components/acexrtool.cpp index 61cd0c541..847f73c52 100644 --- a/applications/compressonatorgui/components/acexrtool.cpp +++ b/applications/compressonatorgui/components/acexrtool.cpp @@ -1,4 +1,4 @@ -#include "acEXRTool.h" +#include "acexrtool.h" acEXRTool::acEXRTool(QWidget *parent) : QDialog(parent) { diff --git a/applications/compressonatorgui/components/acimageview.cpp b/applications/compressonatorgui/components/acimageview.cpp index 988807b6e..8403bc158 100644 --- a/applications/compressonatorgui/components/acimageview.cpp +++ b/applications/compressonatorgui/components/acimageview.cpp @@ -24,7 +24,7 @@ // //===================================================================== -#include "acImageView.h" +#include "acimageview.h" #define CURSOR_SIZE 12 // pixel per cross hair fin diff --git a/applications/compressonatorgui/components/acimageview.h b/applications/compressonatorgui/components/acimageview.h index bffc9df86..5192d971d 100644 --- a/applications/compressonatorgui/components/acimageview.h +++ b/applications/compressonatorgui/components/acimageview.h @@ -36,9 +36,9 @@ #include // Local -#include "acCustomGraphics.h" -#include "acTableImageDataModel.h" -#include "cpImageLoader.h" +#include "accustomgraphics.h" +#include "actableimagedatamodel.h" +#include "cpimageloader.h" #define AC_IMAGE_MAX_ZOOM 9999 #define AC_IMAGE_MIN_ZOOM 10 diff --git a/applications/compressonatorgui/components/acoglwidget.cpp b/applications/compressonatorgui/components/acoglwidget.cpp index f317a4a6f..a1d5bd4f9 100644 --- a/applications/compressonatorgui/components/acoglwidget.cpp +++ b/applications/compressonatorgui/components/acoglwidget.cpp @@ -2,7 +2,7 @@ // Copyright 2016 (c), Advanced Micro Devices, Inc. All rights reserved. //===================================================================== -#include "acOGLWidget.h" +#include "acoglwidget.h" #include #include "qopengltexture.h" diff --git a/applications/compressonatorgui/components/acoglwidget.h b/applications/compressonatorgui/components/acoglwidget.h index 59c7c7346..b122c1eb6 100644 --- a/applications/compressonatorgui/components/acoglwidget.h +++ b/applications/compressonatorgui/components/acoglwidget.h @@ -7,9 +7,7 @@ #include #include -//#include "AMDCompress.h" -//#include "MIPS.h" -#include "PluginManager.h" +#include "pluginmanager.h" #include #include @@ -21,7 +19,7 @@ #include #endif -#include "acCustomGraphics.h" +#include "accustomgraphics.h" #include "geometryengine.h" diff --git a/applications/compressonatorgui/components/acprogressanimationwidget.cpp b/applications/compressonatorgui/components/acprogressanimationwidget.cpp index 79d4efee1..b46c20078 100644 --- a/applications/compressonatorgui/components/acprogressanimationwidget.cpp +++ b/applications/compressonatorgui/components/acprogressanimationwidget.cpp @@ -6,9 +6,7 @@ /// //================================================================================== -#include "acProgressAnimationWidget.h" -//#include - +#include "acprogressanimationwidget.h" #include #define AC_PROGRESS_ANIM_COEFF 30 diff --git a/applications/compressonatorgui/components/acprogressdlg.cpp b/applications/compressonatorgui/components/acprogressdlg.cpp index 9065b9cc8..5f17da1b3 100644 --- a/applications/compressonatorgui/components/acprogressdlg.cpp +++ b/applications/compressonatorgui/components/acprogressdlg.cpp @@ -7,8 +7,8 @@ //================================================================================== //#include -#include "acProgressDlg.h" -#include "acProgressAnimationWidget.h" +#include "acprogressdlg.h" +#include "acprogressanimationwidget.h" #include diff --git a/applications/compressonatorgui/components/actableimagedatamodel.cpp b/applications/compressonatorgui/components/actableimagedatamodel.cpp index 526ebe77f..c9c8dd16e 100644 --- a/applications/compressonatorgui/components/actableimagedatamodel.cpp +++ b/applications/compressonatorgui/components/actableimagedatamodel.cpp @@ -25,7 +25,7 @@ //===================================================================== // mymodel.cpp -#include "acTableImageDataModel.h" +#include "actableimagedatamodel.h" acTableImageDataModel::acTableImageDataModel(int rowsize, int colsize, QObject *parent) :QAbstractTableModel(parent) { diff --git a/applications/compressonatorgui/components/cmakelists.txt b/applications/compressonatorgui/components/cmakelists.txt index 445ccd793..ca5e79b55 100644 --- a/applications/compressonatorgui/components/cmakelists.txt +++ b/applications/compressonatorgui/components/cmakelists.txt @@ -1,67 +1,67 @@ add_library(CMP_GUI_BIN_Components INTERFACE) target_sources(CMP_GUI_BIN_Components INTERFACE - ac3DMeshAnalysis.h - acAboutDlg.h - acCustomDockWidget.h - acCustomGraphics.h - acDiffImage.h - acDockWidgetTitleBar.h - acEXRTool.h - acImageView.h - acOGLWidget.h - acProgressAnimationWidget.h - acProgressDlg.h - acTableImageDataModel.h - cp3DModelCompare.h - cp3DModelConvert.h - cp3DModelView.h - cpCompressStatus.h - cpGenMips.h - cpImageAnalysis.h - cpImageCompare.h - cpImageFileData.h - cpImagePropertyView.h - cpImageView.h - cpNewProject.h - cpProjectData.h - cpProjectView.h - cpSetApplicationOptions.h - cpSetCompressOptions.h - cpSetMeshOptions.h - cpStartupPage.h - cpWelcomePage.h + ac3dmeshanalysis.h + acaboutdlg.h + accustomdockwidget.h + accustomgraphics.h + acdiffimage.h + acdockwidgettitlebar.h + acexrtool.h + acimageview.h + acoglwidget.h + acprogressanimationwidget.h + acprogressdlg.h + actableimagedatamodel.h + cp3dmodelcompare.h + cp3dmodelconvert.h + cp3dmodelview.h + cpcompressstatus.h + cpgenmips.h + cpimageanalysis.h + cpimagecompare.h + cpimagefiledata.h + cpimagepropertyview.h + cpimageview.h + cpnewproject.h + cpprojectdata.h + cpprojectview.h + cpsetapplicationoptions.h + cpsetcompressoptions.h + cpsetmeshoptions.h + cpstartuppage.h + cpwelcomepage.h ) target_sources(CMP_GUI_BIN_Components INTERFACE - ac3DMeshAnalysis.cpp - acAboutDlg.cpp - acCustomDockWidget.cpp - acCustomGraphics.cpp - acDiffImage.cpp - acDockWidgetTitleBar.cpp - acEXRTool.cpp - acImageView.cpp - acOGLWidget.cpp - acProgressAnimationWidget.cpp - acProgressDlg.cpp - acTableImageDataModel.cpp - cp3DModelCompare.cpp - cp3DModelConvert.cpp - cp3DModelView.cpp - cpCompressStatus.cpp - cpGenMips.cpp - cpImageAnalysis.cpp - cpImageCompare.cpp - cpImagePropertyView.cpp - cpImageView.cpp - cpNewProject.cpp - cpProjectView.cpp - cpSetApplicationOptions.cpp - cpSetCompressOptions.cpp - cpSetMeshOptions.cpp - cpStartupPage.cpp - cpWelcomePage.cpp + ac3dmeshanalysis.cpp + acaboutdlg.cpp + accustomdockwidget.cpp + accustomgraphics.cpp + acdiffimage.cpp + acdockwidgettitlebar.cpp + acexrtool.cpp + acimageview.cpp + acoglwidget.cpp + acprogressanimationwidget.cpp + acprogressdlg.cpp + actableimagedatamodel.cpp + cp3dmodelcompare.cpp + cp3dmodelconvert.cpp + cp3dmodelview.cpp + cpcompressstatus.cpp + cpgenmips.cpp + cpimageanalysis.cpp + cpimagecompare.cpp + cpimagepropertyview.cpp + cpimageview.cpp + cpnewproject.cpp + cpprojectview.cpp + cpsetapplicationoptions.cpp + cpsetcompressoptions.cpp + cpsetmeshoptions.cpp + cpstartuppage.cpp + cpwelcomepage.cpp ) target_link_libraries(CMP_GUI_BIN_Components INTERFACE diff --git a/applications/compressonatorgui/components/cp3dmodelcompare.cpp b/applications/compressonatorgui/components/cp3dmodelcompare.cpp index c13cd20cb..8b178bbbb 100644 --- a/applications/compressonatorgui/components/cp3dmodelcompare.cpp +++ b/applications/compressonatorgui/components/cp3dmodelcompare.cpp @@ -29,8 +29,8 @@ #include #include -#include "cp3DModelCompare.h" -#include "cpMainComponents.h" +#include "cp3dmodelcompare.h" +#include "cpmaincomponents.h" C3DModelCompare::C3DModelCompare(const QString title, QString file1, QString file2, bool isCompressed, QMainWindow *parent) : acCustomDockWidget(title, parent) { m_parent = parent; diff --git a/applications/compressonatorgui/components/cp3dmodelcompare.h b/applications/compressonatorgui/components/cp3dmodelcompare.h index bc12d3bb1..6ff8b7671 100644 --- a/applications/compressonatorgui/components/cp3dmodelcompare.h +++ b/applications/compressonatorgui/components/cp3dmodelcompare.h @@ -25,15 +25,15 @@ #define _3DMODELCOMPARE_H #include -#include "cp3DModelView.h" +#include "cp3dmodelview.h" #ifdef USE_IMGDIFF -#include "cpImageView.h" +#include "cpimageview.h" #endif -#include "cpImageAnalysis.h" -#include "acCustomDockWidget.h" -#include "cpProjectData.h" +#include "cpimageanalysis.h" +#include "accustomdockwidget.h" +#include "cpprojectdata.h" class C3DModelCompare : public acCustomDockWidget { Q_OBJECT diff --git a/applications/compressonatorgui/components/cp3dmodelconvert.cpp b/applications/compressonatorgui/components/cp3dmodelconvert.cpp index 14f41a396..6600d387c 100644 --- a/applications/compressonatorgui/components/cp3dmodelconvert.cpp +++ b/applications/compressonatorgui/components/cp3dmodelconvert.cpp @@ -23,11 +23,11 @@ // //===================================================================== -#include "cp3DModelConvert.h" +#include "cp3dmodelconvert.h" -#include "PluginInterface.h" -#include "cpMainComponents.h" +#include "plugininterface.h" +#include "cpmaincomponents.h" #ifdef USE_ASSIMP #include diff --git a/applications/compressonatorgui/components/cp3dmodelview.cpp b/applications/compressonatorgui/components/cp3dmodelview.cpp index 1fdbe98eb..4dd75cd8b 100644 --- a/applications/compressonatorgui/components/cp3dmodelview.cpp +++ b/applications/compressonatorgui/components/cp3dmodelview.cpp @@ -21,9 +21,9 @@ // //===================================================================== -#include "cp3DModelView.h" -#include "cpMainComponents.h" -#include +#include "cp3dmodelview.h" +#include "cpmaincomponents.h" +#include #include #include //---------------------------------------- diff --git a/applications/compressonatorgui/components/cp3dmodelview.h b/applications/compressonatorgui/components/cp3dmodelview.h index 1fee5329d..66500566c 100644 --- a/applications/compressonatorgui/components/cp3dmodelview.h +++ b/applications/compressonatorgui/components/cp3dmodelview.h @@ -29,10 +29,10 @@ #include #include -#include "Compressonator.h" -#include "Common.h" -#include "acCustomDockWidget.h" -#include "PluginInterface.h" +#include "compressonator.h" +#include "common.h" +#include "accustomdockwidget.h" +#include "plugininterface.h" #define HIDE_VIEW_OPTIONS "Hide View Options" #define SHOW_VIEW_OPTIONS "Show View Options" diff --git a/applications/compressonatorgui/components/cpcompressstatus.cpp b/applications/compressonatorgui/components/cpcompressstatus.cpp index 6e2dba93e..9dbfc1a8a 100644 --- a/applications/compressonatorgui/components/cpcompressstatus.cpp +++ b/applications/compressonatorgui/components/cpcompressstatus.cpp @@ -23,7 +23,7 @@ // //===================================================================== -#include "cpCompressStatus.h" +#include "cpcompressstatus.h" CompressStatusDialog::CompressStatusDialog(const QString title, QWidget *parent) : QDockWidget(parent) diff --git a/applications/compressonatorgui/components/cpcompressstatus.h b/applications/compressonatorgui/components/cpcompressstatus.h index 4aae3de98..57dbdee67 100644 --- a/applications/compressonatorgui/components/cpcompressstatus.h +++ b/applications/compressonatorgui/components/cpcompressstatus.h @@ -37,10 +37,10 @@ #include #include -#include "Compressonator.h" -#include "Common.h" -#include "PluginManager.h" -#include "acCustomDockWidget.h" +#include "compressonator.h" +#include "common.h" +#include "pluginmanager.h" +#include "accustomdockwidget.h" class CompressStatusDialog : public QDockWidget diff --git a/applications/compressonatorgui/components/cpgenmips.cpp b/applications/compressonatorgui/components/cpgenmips.cpp index ca9e43c32..a81de90a4 100644 --- a/applications/compressonatorgui/components/cpgenmips.cpp +++ b/applications/compressonatorgui/components/cpgenmips.cpp @@ -23,7 +23,7 @@ // //===================================================================== -#include "cpGenMips.h" +#include "cpgenmips.h" #define LOWEST_MIP_LEVELS "Lowest Mip-Level (Width x Height)" diff --git a/applications/compressonatorgui/components/cpgenmips.h b/applications/compressonatorgui/components/cpgenmips.h index 13baae47c..35428758a 100644 --- a/applications/compressonatorgui/components/cpgenmips.h +++ b/applications/compressonatorgui/components/cpgenmips.h @@ -26,7 +26,7 @@ #ifndef _GENMIPS_H #define _GENMIPS_H -#include "Compressonator.h" +#include "compressonator.h" #include #include diff --git a/applications/compressonatorgui/components/cpimageanalysis.cpp b/applications/compressonatorgui/components/cpimageanalysis.cpp index eb7c9c0ab..ca802dfe8 100644 --- a/applications/compressonatorgui/components/cpimageanalysis.cpp +++ b/applications/compressonatorgui/components/cpimageanalysis.cpp @@ -23,7 +23,7 @@ // //===================================================================== -#include "cpImageAnalysis.h" +#include "cpimageanalysis.h" #include diff --git a/applications/compressonatorgui/components/cpimageanalysis.h b/applications/compressonatorgui/components/cpimageanalysis.h index 8230352aa..d493d7595 100644 --- a/applications/compressonatorgui/components/cpimageanalysis.h +++ b/applications/compressonatorgui/components/cpimageanalysis.h @@ -26,10 +26,10 @@ #ifndef CPIMAGEANALYSIS_H #define CPIMAGEANALYSIS_H -#include "PluginManager.h" -#include "CAnalysis.h" +#include "pluginmanager.h" +#include "canalysis.h" -#include +#include #include diff --git a/applications/compressonatorgui/components/cpimagecompare.cpp b/applications/compressonatorgui/components/cpimagecompare.cpp index 885aeb0fb..0589c4f17 100644 --- a/applications/compressonatorgui/components/cpimagecompare.cpp +++ b/applications/compressonatorgui/components/cpimagecompare.cpp @@ -32,8 +32,8 @@ // for XML file processing #include -#include "cpImageCompare.h" -#include "cpMainComponents.h" +#include "cpimagecompare.h" +#include "cpmaincomponents.h" CImageCompare::CImageCompare(const QString title, QString file1, QString file2, bool isCompressed, QMainWindow *parent) : acCustomDockWidget(title, parent) { diff --git a/applications/compressonatorgui/components/cpimagecompare.h b/applications/compressonatorgui/components/cpimagecompare.h index d7f2dcbe1..2f57b245b 100644 --- a/applications/compressonatorgui/components/cpimagecompare.h +++ b/applications/compressonatorgui/components/cpimagecompare.h @@ -28,11 +28,11 @@ #include #include -#include "cpImageView.h" -#include "cpImageAnalysis.h" -#include "acCustomDockWidget.h" -#include "cpProjectData.h" -#include "CMP_FileIO.h" +#include "cpimageview.h" +#include "cpimageanalysis.h" +#include "accustomdockwidget.h" +#include "cpprojectdata.h" +#include "cmp_fileio.h" class CImageCompare : public acCustomDockWidget { Q_OBJECT diff --git a/applications/compressonatorgui/components/cpimagefiledata.h b/applications/compressonatorgui/components/cpimagefiledata.h index cfb4b1bba..13b5dee98 100644 --- a/applications/compressonatorgui/components/cpimagefiledata.h +++ b/applications/compressonatorgui/components/cpimagefiledata.h @@ -34,8 +34,8 @@ #include "qtpropertymanager.h" #include "qtvariantproperty.h" #include "objectcontroller.h" -#include "cpImageLoader.h" -#include "cpProjectData.h" +#include "cpimageloader.h" +#include "cpprojectdata.h" diff --git a/applications/compressonatorgui/components/cpimageloader.cpp b/applications/compressonatorgui/components/cpimageloader.cpp index f9c45cbff..444dd92e4 100644 --- a/applications/compressonatorgui/components/cpimageloader.cpp +++ b/applications/compressonatorgui/components/cpimageloader.cpp @@ -21,10 +21,9 @@ // //===================================================================== -#include "cpImageLoader.h" +#include "cpimageloader.h" -#include -#include +#include #include #include diff --git a/applications/compressonatorgui/components/cpimageloader.h b/applications/compressonatorgui/components/cpimageloader.h index 71e63acc9..72ad2c536 100644 --- a/applications/compressonatorgui/components/cpimageloader.h +++ b/applications/compressonatorgui/components/cpimageloader.h @@ -27,13 +27,13 @@ #include "stdlib.h" -#include "Compressonator.h" -#include "Common.h" +#include "compressonator.h" +#include "common.h" #include "cmdline.h" -#include "PluginManager.h" -#include "TC_PluginAPI.h" -#include "TextureIO.h" +#include "pluginmanager.h" +#include "tc_pluginapi.h" +#include "textureio.h" #include #include diff --git a/applications/compressonatorgui/components/cpimagepropertyview.cpp b/applications/compressonatorgui/components/cpimagepropertyview.cpp index 0388d1a4a..1b239ec5f 100644 --- a/applications/compressonatorgui/components/cpimagepropertyview.cpp +++ b/applications/compressonatorgui/components/cpimagepropertyview.cpp @@ -21,7 +21,7 @@ // //===================================================================== -#include "cpImagePropertyView.h" +#include "cpimagepropertyview.h" #define COMPRESS_TEXT " Process " #define SAVECOMP_TEXT " Save && Process " diff --git a/applications/compressonatorgui/components/cpimagepropertyview.h b/applications/compressonatorgui/components/cpimagepropertyview.h index 5df71f33f..055a53530 100644 --- a/applications/compressonatorgui/components/cpimagepropertyview.h +++ b/applications/compressonatorgui/components/cpimagepropertyview.h @@ -37,8 +37,8 @@ #include "qtpropertymanager.h" #include "qtvariantproperty.h" #include "objectcontroller.h" -#include "cpProjectData.h" -#include "acCustomDockWidget.h" +#include "cpprojectdata.h" +#include "accustomdockwidget.h" class CImagePropertyView : public QDockWidget diff --git a/applications/compressonatorgui/components/cpimageview.cpp b/applications/compressonatorgui/components/cpimageview.cpp index 998a84a34..282211578 100644 --- a/applications/compressonatorgui/components/cpimageview.cpp +++ b/applications/compressonatorgui/components/cpimageview.cpp @@ -21,8 +21,8 @@ // //===================================================================== -#include "cpImageView.h" -#include "acImageView.h" +#include "cpimageview.h" +#include "acimageview.h" void cpImageView::oncpImageViewVirtualMousePosition(QPointF* scenePos, QPointF* localPos, int onID) { oncpImageViewMousePosition(scenePos, localPos, onID); @@ -176,7 +176,7 @@ void cpImageView::oncpImageViewMousePosition(QPointF* scenePos, QPointF* localPo } } -#include "cExr.h" +#include "cexr.h" #include "ImfArray.h" #include "ImfRgba.h" @@ -1241,7 +1241,7 @@ cpImageView::cpImageView(const QString filePathName, if (m_processedMipImages->decompressedMipSet != NULL) { m_PSNRLabel = new QLabel(this); if (m_PSNRLabel) { - m_PSNRLabel->setText("PSNR: N/A"); + m_PSNRLabel->setText("PSNR: Not Available"); m_toolBar->addWidget(m_PSNRLabel); } } else @@ -1692,7 +1692,7 @@ void cpImageView::onacScaleChange(int value) { } void cpImageView::onacPSNRUpdated(double value) { - if (m_PSNRLabel) { + if (m_PSNRLabel && value > 0) { char buff[16]; snprintf(buff, sizeof(buff), "PSNR: %3.1f dB", value); m_PSNRLabel->setText(buff); diff --git a/applications/compressonatorgui/components/cpimageview.h b/applications/compressonatorgui/components/cpimageview.h index 8b72517dd..278b5bfb2 100644 --- a/applications/compressonatorgui/components/cpimageview.h +++ b/applications/compressonatorgui/components/cpimageview.h @@ -35,11 +35,11 @@ #include #include -#include "cpImageView.h" -#include "acImageView.h" -#include "acEXRTool.h" -#include "cpImageLoader.h" -#include "acCustomDockWidget.h" +#include "cpimageview.h" +#include "acimageview.h" +#include "acexrtool.h" +#include "cpimageloader.h" +#include "accustomdockwidget.h" #define TXT_IMAGE_PROCESSED "Processed" diff --git a/applications/compressonatorgui/components/cpnewproject.cpp b/applications/compressonatorgui/components/cpnewproject.cpp index ddc599584..7dafdc50d 100644 --- a/applications/compressonatorgui/components/cpnewproject.cpp +++ b/applications/compressonatorgui/components/cpnewproject.cpp @@ -23,7 +23,7 @@ #include -#include "cpNewProject.h" +#include "cpnewproject.h" cpNewProject::cpNewProject(QWidget *parent): m_parent(parent) { diff --git a/applications/compressonatorgui/components/cpprojectdata.h b/applications/compressonatorgui/components/cpprojectdata.h index 3a4ea7cdf..32b9eecb7 100644 --- a/applications/compressonatorgui/components/cpprojectdata.h +++ b/applications/compressonatorgui/components/cpprojectdata.h @@ -35,16 +35,16 @@ #include "objectcontroller.h" #include #include -#include "PluginManager.h" -#include "cpImageLoader.h" -#include "ATIFormats.h" -#include "TextureIO.h" -#include "Common.h" +#include "pluginmanager.h" +#include "cpimageloader.h" +#include "atiformats.h" +#include "textureio.h" +#include "common.h" // JSon #include "json/json.h" // Mesh #include "cmp_mesh.h" -#include "ModelData.h" +#include "modeldata.h" diff --git a/applications/compressonatorgui/components/cpprojectview.cpp b/applications/compressonatorgui/components/cpprojectview.cpp index a9a690088..c47abd373 100644 --- a/applications/compressonatorgui/components/cpprojectview.cpp +++ b/applications/compressonatorgui/components/cpprojectview.cpp @@ -21,7 +21,7 @@ // //===================================================================== -#include "cpProjectView.h" +#include "cpprojectview.h" #include "cmdline.h" @@ -30,13 +30,13 @@ #else #include "../../_Plugins/CMesh/Tootle/mesh_tootle.h" #endif -#include "cpMainComponents.h" +#include "cpmaincomponents.h" #ifdef USE_ASSIMP #include #endif -#include +#include #include #include diff --git a/applications/compressonatorgui/components/cpprojectview.h b/applications/compressonatorgui/components/cpprojectview.h index 344de855e..7113b5d91 100644 --- a/applications/compressonatorgui/components/cpprojectview.h +++ b/applications/compressonatorgui/components/cpprojectview.h @@ -44,23 +44,23 @@ #include "objectcontroller.h" // Progress Bar -#include "acProgressDlg.h" -#include "acDiffImage.h" -#include "ac3DMeshAnalysis.h" -#include "cpTreeWidget.h" -#include "cpImageView.h" -#include "cpProjectData.h" -#include "cpSetCompressOptions.h" -#include "cpCompressStatus.h" -#include "cpImageLoader.h" -#include "cpNewProject.h" -#include "TextureIO.h" -#include "ModelData.h" +#include "acprogressdlg.h" +#include "acdiffimage.h" +#include "ac3dmeshanalysis.h" +#include "cptreewidget.h" +#include "cpimageview.h" +#include "cpprojectdata.h" +#include "cpsetcompressoptions.h" +#include "cpcompressstatus.h" +#include "cpimageloader.h" +#include "cpnewproject.h" +#include "textureio.h" +#include "modeldata.h" // JSon #include "json/json.h" -#include "CMP_FileIO.h" +#include "cmp_fileio.h" #define MAX_PROJECTVIEW_COLUMNS 3 // Project view columns to view diff --git a/applications/compressonatorgui/components/cpsetapplicationoptions.cpp b/applications/compressonatorgui/components/cpsetapplicationoptions.cpp index 849720a93..49f3a7b88 100644 --- a/applications/compressonatorgui/components/cpsetapplicationoptions.cpp +++ b/applications/compressonatorgui/components/cpsetapplicationoptions.cpp @@ -21,7 +21,7 @@ // //===================================================================== -#include "cpSetApplicationOptions.h" +#include "cpsetapplicationoptions.h" #include "qtbuttonpropertybrowser.h" #include "qteditorfactory.h" #include "qtgroupboxpropertybrowser.h" diff --git a/applications/compressonatorgui/components/cpsetapplicationoptions.h b/applications/compressonatorgui/components/cpsetapplicationoptions.h index 8338aaece..3d604957d 100644 --- a/applications/compressonatorgui/components/cpsetapplicationoptions.h +++ b/applications/compressonatorgui/components/cpsetapplicationoptions.h @@ -24,7 +24,7 @@ #ifndef _SETAPPLICATIONOPTIONS_H #define _SETAPPLICATIONOPTIONS_H -#include "cpProjectData.h" +#include "cpprojectdata.h" #include "qtpropertymanager.h" #include "qtvariantproperty.h" #include "qtgroupboxpropertybrowser.h" diff --git a/applications/compressonatorgui/components/cpsetcompressoptions.cpp b/applications/compressonatorgui/components/cpsetcompressoptions.cpp index 373d76d9f..83e0be0c0 100644 --- a/applications/compressonatorgui/components/cpsetcompressoptions.cpp +++ b/applications/compressonatorgui/components/cpsetcompressoptions.cpp @@ -20,8 +20,8 @@ // THE SOFTWARE. // //===================================================================== -#include "cpSetCompressOptions.h" -#include "cpMainComponents.h" +#include "cpsetcompressoptions.h" +#include "cpmaincomponents.h" #include "qtbuttonpropertybrowser.h" #include "qteditorfactory.h" @@ -34,7 +34,7 @@ #include #include -#include "Common.h" +#include "common.h" #include #include diff --git a/applications/compressonatorgui/components/cpsetcompressoptions.h b/applications/compressonatorgui/components/cpsetcompressoptions.h index adcd5d1f8..bb52249ee 100644 --- a/applications/compressonatorgui/components/cpsetcompressoptions.h +++ b/applications/compressonatorgui/components/cpsetcompressoptions.h @@ -29,10 +29,10 @@ #include "qtgroupboxpropertybrowser.h" #include "objectcontroller.h" #include -#include "PluginManager.h" -#include "Compressonator.h" -#include "Common.h" -#include "cpProjectData.h" +#include "pluginmanager.h" +#include "compressonator.h" +#include "common.h" +#include "cpprojectdata.h" class CSetCompressOptions : public QDialog { Q_OBJECT diff --git a/applications/compressonatorgui/components/cpsetmeshoptions.cpp b/applications/compressonatorgui/components/cpsetmeshoptions.cpp index b4a35caee..3753eda1d 100644 --- a/applications/compressonatorgui/components/cpsetmeshoptions.cpp +++ b/applications/compressonatorgui/components/cpsetmeshoptions.cpp @@ -34,7 +34,7 @@ #include "qtbuttonpropertybrowser.h" #include "qtgroupboxpropertybrowser.h" -#include "cpMainComponents.h" +#include "cpmaincomponents.h" #define DROPDOWN_FILEEXT_WIDTH 60 diff --git a/applications/compressonatorgui/components/cpsetmeshoptions.h b/applications/compressonatorgui/components/cpsetmeshoptions.h index edd425c17..cc4883e84 100644 --- a/applications/compressonatorgui/components/cpsetmeshoptions.h +++ b/applications/compressonatorgui/components/cpsetmeshoptions.h @@ -29,9 +29,9 @@ #include "qtgroupboxpropertybrowser.h" #include "objectcontroller.h" #include -#include "PluginManager.h" -#include "Compressonator.h" -#include "cpProjectData.h" +#include "pluginmanager.h" +#include "compressonator.h" +#include "cpprojectdata.h" class CSetMeshOptions : public QDialog { Q_OBJECT diff --git a/applications/compressonatorgui/components/cpstartuppage.cpp b/applications/compressonatorgui/components/cpstartuppage.cpp index dfa43fc20..fe55c4c71 100644 --- a/applications/compressonatorgui/components/cpstartuppage.cpp +++ b/applications/compressonatorgui/components/cpstartuppage.cpp @@ -27,7 +27,7 @@ #include // Local -#include "cpStartupPage.h" +#include "cpstartuppage.h" #define CP_STR_startup_page_openProjectLink "open_project" #define CP_STR_startup_page_openProjectLinkPrefix CP_STR_startup_page_openProjectLink "_" diff --git a/applications/compressonatorgui/components/cpwelcomepage.cpp b/applications/compressonatorgui/components/cpwelcomepage.cpp index 97177adf3..acb27edfb 100644 --- a/applications/compressonatorgui/components/cpwelcomepage.cpp +++ b/applications/compressonatorgui/components/cpwelcomepage.cpp @@ -27,7 +27,7 @@ #include #include #include -#include "cpWelcomePage.h" +#include "cpwelcomepage.h" CWelcomePage::CWelcomePage(const QString title, QWidget *parent) diff --git a/applications/compressonatorgui/components/cpwelcomepage.h b/applications/compressonatorgui/components/cpwelcomepage.h index 85f3d2761..3072c5438 100644 --- a/applications/compressonatorgui/components/cpwelcomepage.h +++ b/applications/compressonatorgui/components/cpwelcomepage.h @@ -26,8 +26,8 @@ #include #include -#include "cpStartupPage.h" -#include "acCustomDockWidget.h" +#include "cpstartuppage.h" +#include "accustomdockwidget.h" class CWelcomePage : public acCustomDockWidget { Q_OBJECT diff --git a/applications/compressonatorgui/copyfiles.cmake b/applications/compressonatorgui/copyfiles.cmake index e948cba75..159ca3fb6 100644 --- a/applications/compressonatorgui/copyfiles.cmake +++ b/applications/compressonatorgui/copyfiles.cmake @@ -25,11 +25,11 @@ else() endif() -cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/RunTime/BC7_Compression.cprj ${ASSETS_PATH}/Projects/BC7_Compression.cprj) -cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/RunTime/BC6H_Compression.cprj ${ASSETS_PATH}/Projects/BC6H_Compression.cprj) +cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/runtime/bc7_compression.cprj ${ASSETS_PATH}/projects/bc7_compression.cprj) +cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/runtime/bc6h_compression.cprj ${ASSETS_PATH}/Projects/bc6h_compression.cprj) -cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/RunTime/images/Balls.exr ${ASSETS_PATH}/images/Balls.exr) -cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/RunTime/images/ruby.bmp ${ASSETS_PATH}/images/ruby.bmp) +cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/runtime/images/balls.exr ${ASSETS_PATH}/images/balls.exr) +cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/runtime/images/ruby.bmp ${ASSETS_PATH}/images/ruby.bmp) file(GLOB_RECURSE GUI_ASSETS WelcomePage/*) foreach(gui_asset ${GUI_ASSETS}) @@ -40,12 +40,8 @@ endforeach() cmp_gui_copy_to_output(${CMAKE_CURRENT_LIST_DIR}/qt.conf ${ASSETS_PATH}/qt.conf) -cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/Applications/_Plugins/CGPUDecode/Vulkan/VK_ComputeShader/texture.vert.spv ${ASSETS_PATH}/texture.vert.spv) -cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/Applications/_Plugins/CGPUDecode/Vulkan/VK_ComputeShader/texture.frag.spv ${ASSETS_PATH}/texture.frag.spv) - -# TODO Plugins/Compute -# TODO Plugins/Media -# TODO plugins/shaders +cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/applications/_plugins/cgpudecode/vulkan/vk_computeshader/texture.vert.spv ${ASSETS_PATH}/texture.vert.spv) +cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/applications/_plugins/cgpudecode/vulkan/vk_computeshader/texture.frag.spv ${ASSETS_PATH}/texture.frag.spv) get_property(QT_LIB_DIR GLOBAL PROPERTY QT_LIB_DIR) @@ -96,10 +92,10 @@ foreach(rsc ${QT_RESOURCES}) cmp_gui_copy_to_output(${rsc} ${ASSETS_PATH}/resources/${asset}) endforeach() -include(${PROJECT_SOURCE_DIR}/Applications/_Plugins/C3DModel_viewers/glTF_DX12_EX/CopyFiles.cmake) +include(${PROJECT_SOURCE_DIR}/applications/_plugins/c3dmodel_viewers/gltf_dx12_ex/copyfiles.cmake) gltf_dx12_copy_files(CompressonatorGUI-bin ${PLUGINS_PATH}) -include(${PROJECT_SOURCE_DIR}/Applications/_Plugins/C3DModel_viewers/Vulkan/CopyFiles.cmake) +include(${PROJECT_SOURCE_DIR}/applications/_plugins/c3dmodel_viewers/vulkan/copyfiles.cmake) gltf_vulkan_copy_files(CompressonatorGUI-bin ${PLUGINS_PATH}) #copy glew32.dll @@ -113,10 +109,10 @@ cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/../common/lib/ext/opencv/2.49/x64/V cmp_gui_copy_to_output(${PROJECT_SOURCE_DIR}/../common/lib/ext/ktx/build/$<$:debug>$<$:release>/ktx.dll ${ASSETS_PATH}/ktx.dll) # GPU Shaders -file(GLOB_RECURSE GPUCOMPUTE_SHADERS ${PROJECT_SOURCE_DIR}/CMP_Core/shaders/*) +file(GLOB_RECURSE GPUCOMPUTE_SHADERS ${PROJECT_SOURCE_DIR}/cmp_core/shaders/*) #message(STATUS "************** GPUCOMPUTE_SHADERS [${GPUCOMPUTE_SHADERS}]" ) foreach(rsc ${GPUCOMPUTE_SHADERS}) - file(RELATIVE_PATH asset ${PROJECT_SOURCE_DIR}/CMP_Core/shaders ${rsc}) + file(RELATIVE_PATH asset ${PROJECT_SOURCE_DIR}/cmp_core/shaders ${rsc}) #message(STATUS "************** COPY SHADERS [${rsc} to ${ASSETS_PATH}/${asset}]" ) cmp_gui_copy_to_output(${rsc} ${ASSETS_PATH}/plugins/compute/${asset}) endforeach() diff --git a/applications/compressonatorgui/source/cpmaincomponents.cpp b/applications/compressonatorgui/source/cpmaincomponents.cpp index 2d8a11eeb..bed3b1a24 100644 --- a/applications/compressonatorgui/source/cpmaincomponents.cpp +++ b/applications/compressonatorgui/source/cpmaincomponents.cpp @@ -21,13 +21,13 @@ // //===================================================================== -#include "cpMainComponents.h" +#include "cpmaincomponents.h" -#include "Compressonator.h" -#include "Common.h" -#include "Version.h" +#include "compressonator.h" +#include "common.h" +#include "version.h" -#include +#include #include @@ -893,7 +893,7 @@ void cpMainComponents::onGenerateMIPMap(CMP_CFilterParams CFilterParams, QTreeWi if (g_plugin_MipMapFilter) { // Init CMips & all devices if (g_plugin_MipMapFilter->TC_PluginSetSharedIO(g_CMIPS) == CMP_OK) { - result = g_plugin_MipMapFilter->TC_GenerateMIPLevels((CMP_MipSet*)data->m_MipImages->mipset, &CFilterParams); + result = g_plugin_MipMapFilter->TC_CFilter((CMP_MipSet*)data->m_MipImages->mipset,NULL, &CFilterParams); } else result = CMP_ERR_GENERIC; } else diff --git a/applications/compressonatorgui/source/cpmaincomponents.h b/applications/compressonatorgui/source/cpmaincomponents.h index 7fb1ca7bc..47b00ee16 100644 --- a/applications/compressonatorgui/source/cpmaincomponents.h +++ b/applications/compressonatorgui/source/cpmaincomponents.h @@ -27,34 +27,34 @@ #include #include #include -#include "cpImagePropertyView.h" -#include "cpGenMips.h" -#include "cpSetCompressOptions.h" -#include "cpSetApplicationOptions.h" -#include "cpProjectView.h" -#include "cpImageView.h" -#include "cp3DModelView.h" -#include "cp3DModelCompare.h" -#include "cpWelcomePage.h" -#include "cpImageCompare.h" -#include "cpCompressStatus.h" -#include "acAboutDlg.h" -#include "acProgressDlg.h" +#include "cpimagepropertyview.h" +#include "cpgenmips.h" +#include "cpsetcompressoptions.h" +#include "cpsetapplicationoptions.h" +#include "cpprojectview.h" +#include "cpimageview.h" +#include "cp3dmodelview.h" +#include "cp3dmodelcompare.h" +#include "cpwelcomepage.h" +#include "cpimagecompare.h" +#include "cpcompressstatus.h" +#include "acaboutdlg.h" +#include "acprogressdlg.h" #include "cmdline.h" -#include "UtilFuncs.h" +#include "utilfuncs.h" #include -#include "acCustomDockWidget.h" +#include "accustomdockwidget.h" // //Reserved: GPUDecode // Common Project Data Types -#include "cpProjectData.h" +#include "cpprojectdata.h" // File Menu #include #ifdef USE_3DCONVERT -#include "cp3DModelConvert.h" +#include "cp3dmodelconvert.h" #endif // #define ENABLE_AGS_SUPPORT #ifdef ENABLE_AGS_SUPPORT diff --git a/applications/compressonatorgui/source/main.cpp b/applications/compressonatorgui/source/main.cpp index cc741c38d..9fdf53ca3 100644 --- a/applications/compressonatorgui/source/main.cpp +++ b/applications/compressonatorgui/source/main.cpp @@ -21,11 +21,11 @@ // //===================================================================== -#include "cpMainComponents.h" +#include "cpmaincomponents.h" -#include "Common.h" -#include "Compressonator.h" -#include "PluginManager.h" +#include "common.h" +#include "compressonator.h" +#include "pluginmanager.h" #include diff --git a/cmakelists.txt b/cmakelists.txt index bc71e1cc6..e0f62712b 100644 --- a/cmakelists.txt +++ b/cmakelists.txt @@ -1,6 +1,4 @@ -cmake_minimum_required(VERSION 3.15) - -include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) +cmake_minimum_required(VERSION 3.13) # if(POLICY CMP0091) # cmake_policy(SET CMP0091 NEW) @@ -12,20 +10,23 @@ enable_testing() set(CMAKE_CXX_STANDARD 17) -include(cmake/HelperFunctions.cmake) +include(cmake/helperfunctions.cmake) set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Supported configuration options" FORCE) set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/build-out") -cmp_option(OPTION_CMP_DIRECTX "Use Directx" (CMP_HOST_WINDOWS)) -cmp_option(OPTION_CMP_OPENGL "Use OpenGL" (CMP_HOST_WINDOWS)) -cmp_option(OPTION_CMP_VULKAN "Use Vulkan" (CMP_HOST_WINDOWS)) +cmp_option(OPTION_BUILD_GUI "Build the GUI Application" (CMP_HOST_WINDOWS)) +cmp_option(OPTION_BUILD_EXAMPLES "Build examples" (CMP_HOST_WINDOWS)) +cmp_option(OPTION_BUILD_TESTING "Build tests" (CMP_HOST_WINDOWS)) +cmp_option(OPTION_BUILD_SHARED_LIBS "Build SHARED, if disabled STATIC is built" (BUILD_SHARED_LIBS)) + +cmp_option(OPTION_CMP_DIRECTX "Use Directx" (CMP_HOST_WINDOWS)) # set for windows only +cmp_option(OPTION_CMP_VULKAN "Use Vulkan" ON) # set for windows, can be on other platforms when current code validated! +cmp_option(OPTION_CMP_OPENGL "Use OpenGL" ON) # available on all platforms cmp_option(OPTION_USE_QT_IMAGELOAD "Use Qt for Image Loading" ON) + cmp_option(OPTION_DISABLE_TESTCODE "Remove test code" OFF) -cmp_option(OPTION_BUILD_SHARED_LIBS "Build SHARED, if disabled STATIC is built" (BUILD_SHARED_LIBS)) -cmp_option(OPTION_BUILD_TESTING "Build tests" ON) -cmp_option(OPTION_BUILD_EXAMPLES "Build examples" ON) -cmp_option(NO_LEGACY_BEHAVIOR "Disables any legacy behavior (before CMake migration)" ON) +cmp_option(NO_LEGACY_BEHAVIOR "Disables any legacy behavior (before CMake migration)" ON) # this needs to be removed set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) @@ -57,6 +58,7 @@ endif() if (APPLE OR UNIX) add_compile_definitions(_LINUX=1) + add_definitions(-std=c++17) endif () if (NO_LEGACY_BEHAVIOR) @@ -99,13 +101,13 @@ add_compile_definitions( # if disabled default setting will be used for mesh compression #USE_GLTF2_MIPSET # Enable Image Transcode & Compression support for GLTF files using TextureIO #USE_FILEIO # Used for debugging code - + #New features under devlopement #USE_GTC # LDR Gradient Texture Compressor patent pending #USE_APC # Enable APC encoding reserved for future releases #USE_BASIS # Future release:: Universal format for transcoding codecs #USE_CMP_TRANSCODE # Future release:: Transcode BASIS/GTC to other compressed formats - + # Possible future releases features #ARGB_32_SUPPORT # Enables 32bit Float channel formats #SUPPORT_ETC_ALPHA # for ATC_RGB output enable A @@ -121,6 +123,7 @@ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "") if (CMP_HOST_WINDOWS) + include(${CMAKE_ROOT}/modules/externalproject.cmake) set_property(GLOBAL PROPERTY USE_FOLDERS ON) endif() @@ -129,20 +132,42 @@ if (NOT CMP_HOST_APPLE) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) endif() + +# find_package(OpenCV) +# if (OpenCV_FOUND) +# target_include_directories(Analysis +# PRIVATE +# ${OpenCV_INCLUDE_DIRS}) +# else() +# message(FATAL_ERROR "Package OpenCV are required, but not found. In Unix, run initsetup_unix.sh or sudo apt-get install libopencv-dev to install the libs.") +# endif() +# +# # Qt5 include path - users install required +# find_package(Qt5Gui HINTS ${QT_PACKAGE_ROOT}) +# +# if(Qt5Gui_FOUND) +# target_include_directories(Plugin_CAnalysis +# PRIVATE +# "${Qt5Gui_INCLUDE_DIRS}") +# else() +# message(FATAL_ERROR "Package Qt5 (Qt5Gui) are required, but not found. In Unix, run initsetup_unix.sh or sudo apt-get install qtdeclarative5-dev. If is window, please make sure install qt and add the bin path (i.e. C:\Qt\5.7\msvc2015_64\bin) to environment PATH.") +# endif() + + # Configure Externals, they must be added via 'include' before the applications -include(External/cmake/DependencyInfo.cmake) -include(External/cmake/CMakeLists.txt) -include(External/CMakeLists.txt) +include(external/cmake/dependencyinfo.cmake) +include(external/cmake/CMakeLists.txt) +include(external/CMakeLists.txt) # add_subdirectory(Compressonator ${CMAKE_BINARY_DIR}/Compressonator) -add_subdirectory(CMP_Core) -add_subdirectory(CMP_Framework) -add_subdirectory(CMP_CompressonatorLib) -add_subdirectory(Applications/_Libs) -add_subdirectory(Applications/_Plugins) -add_subdirectory(Applications) +add_subdirectory(cmp_core) +add_subdirectory(cmp_framework) +add_subdirectory(cmp_compressonatorlib) +add_subdirectory(applications/_libs) +add_subdirectory(applications/_plugins) +add_subdirectory(applications) if (OPTION_BUILD_EXAMPLES) - add_subdirectory(Examples) + add_subdirectory(examples) endif() diff --git a/cmp_compressonatorlib/apc/apc_decode.cpp b/cmp_compressonatorlib/apc/apc_decode.cpp index 19dd367ed..48850560f 100644 --- a/cmp_compressonatorlib/apc/apc_decode.cpp +++ b/cmp_compressonatorlib/apc/apc_decode.cpp @@ -22,7 +22,7 @@ //===================================================================== -#include "APC_Decode.h" +#include "apc_decode.h" void (*APC_DecompressBlock)( void *in, void *out) = NULL; diff --git a/cmp_compressonatorlib/apc/apc_decode.h b/cmp_compressonatorlib/apc/apc_decode.h index 9b101ef56..3848c6bb7 100644 --- a/cmp_compressonatorlib/apc/apc_decode.h +++ b/cmp_compressonatorlib/apc/apc_decode.h @@ -25,7 +25,7 @@ #ifndef _APC_DECODE_H_ #define _APC_DECODE_H_ -#include "APC_Definitions.h" +#include "apc_definitions.h" class APCBlockDecoder { public: diff --git a/cmp_compressonatorlib/apc/apc_definitions.h b/cmp_compressonatorlib/apc/apc_definitions.h index 4d8830760..c819145ec 100644 --- a/cmp_compressonatorlib/apc/apc_definitions.h +++ b/cmp_compressonatorlib/apc/apc_definitions.h @@ -25,7 +25,7 @@ #ifndef _APC_DEFINITIONS_H_ #define _APC_DEFINITIONS_H_ -#include "Common.h" +#include "common.h" #define TRUE 1 #define FALSE 0 diff --git a/cmp_compressonatorlib/apc/apc_encode.cpp b/cmp_compressonatorlib/apc/apc_encode.cpp index 81481a543..46f50d2af 100644 --- a/cmp_compressonatorlib/apc/apc_encode.cpp +++ b/cmp_compressonatorlib/apc/apc_encode.cpp @@ -22,7 +22,7 @@ //===================================================================== -#include "APC_Encode.h" +#include "apc_encode.h" void (*APC_CompressBlock)(void *srcblock, void *outblock, void *blockoptions) = NULL; diff --git a/cmp_compressonatorlib/apc/apc_encode.h b/cmp_compressonatorlib/apc/apc_encode.h index 1ead9bea8..2ad9bf4ba 100644 --- a/cmp_compressonatorlib/apc/apc_encode.h +++ b/cmp_compressonatorlib/apc/apc_encode.h @@ -26,7 +26,7 @@ #define _APC_ENCODE_H_ #include -#include "APC_Definitions.h" +#include "apc_definitions.h" class APCBlockEncoder { public: diff --git a/cmp_compressonatorlib/apc/codec_apc.cpp b/cmp_compressonatorlib/apc/codec_apc.cpp index 20322f59e..a4f140cf0 100644 --- a/cmp_compressonatorlib/apc/codec_apc.cpp +++ b/cmp_compressonatorlib/apc/codec_apc.cpp @@ -29,15 +29,15 @@ #pragma warning(disable:4100) // Ignore warnings of unreferenced formal parameters #ifdef _WIN32 -#include "Common.h" +#include "common.h" #ifdef USE_APC -#include "Codec_APC.h" +#include "codec_apc.h" #include #include "debug.h" #ifdef APC_COMPDEBUGGER -#include "CompClient.h" +#include "compclient.h" #endif //====================================================================================== diff --git a/cmp_compressonatorlib/apc/codec_apc.h b/cmp_compressonatorlib/apc/codec_apc.h index e75a22ddf..29a2bbe4f 100644 --- a/cmp_compressonatorlib/apc/codec_apc.h +++ b/cmp_compressonatorlib/apc/codec_apc.h @@ -28,10 +28,10 @@ #ifndef _CODEC_APC_H_INCLUDED_ #define _CODEC_APC_H_INCLUDED_ -#include "Compressonator.h" -#include "Codec_DXTC.h" -#include "APC_Encode.h" -#include "APC_Decode.h" +#include "compressonator.h" +#include "codec_dxtc.h" +#include "apc_encode.h" +#include "apc_decode.h" #include diff --git a/cmp_compressonatorlib/astc/astc_decode.cpp b/cmp_compressonatorlib/astc/astc_decode.cpp index eafd844a7..3f5b734be 100644 --- a/cmp_compressonatorlib/astc/astc_decode.cpp +++ b/cmp_compressonatorlib/astc/astc_decode.cpp @@ -24,9 +24,9 @@ // ASTC_Decode.cpp : A reference decoder for ASTC // -#include "Common.h" -#include "ASTC/ASTC_Decode.h" -#include "ASTC_Host.h" +#include "common.h" +#include "astc/astc_decode.h" +#include "astc_host.h" // //using namespace ASTC_Encoder; // void decompress_symbolic_block2( diff --git a/cmp_compressonatorlib/astc/astc_decode.h b/cmp_compressonatorlib/astc/astc_decode.h index 275f77b3a..4a61b296e 100644 --- a/cmp_compressonatorlib/astc/astc_decode.h +++ b/cmp_compressonatorlib/astc/astc_decode.h @@ -25,7 +25,7 @@ #ifndef _ASTC_DECODE_H_ #define _ASTC_DECODE_H_ -#include "ASTC/ASTC_Definitions.h" +#include "astc/astc_definitions.h" class ASTCBlockDecoder { public: diff --git a/cmp_compressonatorlib/astc/astc_encode.cpp b/cmp_compressonatorlib/astc/astc_encode.cpp index b7819338a..4e60b2b88 100644 --- a/cmp_compressonatorlib/astc/astc_encode.cpp +++ b/cmp_compressonatorlib/astc/astc_encode.cpp @@ -28,12 +28,12 @@ #include #include #include -#include "ASTC_Encode.h" -#include "ASTC_Definitions.h" +#include "astc_encode.h" +#include "astc_definitions.h" #include "softfloat.h" -#include "ASTC_Encode_Kernel.h" -#include "ASTC_Host.h" +#include "astc_encode_kernel.h" +#include "astc_host.h" #ifdef ASTC_COMPDEBUGGER #include "compclient.h" diff --git a/cmp_compressonatorlib/astc/astc_encode.h b/cmp_compressonatorlib/astc/astc_encode.h index 217ef0e64..2f6c8e1c9 100644 --- a/cmp_compressonatorlib/astc/astc_encode.h +++ b/cmp_compressonatorlib/astc/astc_encode.h @@ -26,8 +26,8 @@ #define _ASTC_ENCODE_H_ #include -#include "ASTC_Definitions.h" -#include "ASTC_Encode_Kernel.h" +#include "astc_definitions.h" +#include "astc_encode_kernel.h" class ASTCBlockEncoder { public: diff --git a/cmp_compressonatorlib/astc/astc_encode_kernel.cpp b/cmp_compressonatorlib/astc/astc_encode_kernel.cpp index d0cbe0006..6538bbb78 100644 --- a/cmp_compressonatorlib/astc/astc_encode_kernel.cpp +++ b/cmp_compressonatorlib/astc/astc_encode_kernel.cpp @@ -19,7 +19,7 @@ //====================================== Kernal Compliant Code ============================================ -#include "ASTC_Encode_Kernel.h" +#include "astc_encode_kernel.h" namespace ASTC_Encoder { diff --git a/cmp_compressonatorlib/astc/astc_host.cpp b/cmp_compressonatorlib/astc/astc_host.cpp index 9af860fc3..5a6092e88 100644 --- a/cmp_compressonatorlib/astc/astc_host.cpp +++ b/cmp_compressonatorlib/astc/astc_host.cpp @@ -19,9 +19,9 @@ #include #include -#include "ASTC_Host.h" -#include "ASTC_Encode_Kernel.h" -#include "Compressonator.h" +#include "astc_host.h" +#include "astc_encode_kernel.h" +#include "compressonator.h" //================================= ASTC CPU HOST CODE =========================================== diff --git a/cmp_compressonatorlib/astc/astc_host.h b/cmp_compressonatorlib/astc/astc_host.h index 4bb817ba0..e09febc8b 100644 --- a/cmp_compressonatorlib/astc/astc_host.h +++ b/cmp_compressonatorlib/astc/astc_host.h @@ -26,7 +26,7 @@ #ifndef _ASTC_HOST_H #define _ASTC_HOST_H -#include "ASTC_Encode_Kernel.h" +#include "astc_encode_kernel.h" #include "vectypes.h" #define __constant const diff --git a/cmp_compressonatorlib/astc/astc_library.cpp b/cmp_compressonatorlib/astc/astc_library.cpp index 672f2e47b..b89a16b60 100644 --- a/cmp_compressonatorlib/astc/astc_library.cpp +++ b/cmp_compressonatorlib/astc/astc_library.cpp @@ -22,10 +22,10 @@ // THE SOFTWARE. // -#include "ASTC/ASTC_Definitions.h" -#include "ASTC/ASTC_Encode.h" -#include "ASTC/ASTC_Decode.h" -#include "Compressonator.h" +#include "astc/astc_definitions.h" +#include "astc/astc_encode.h" +#include "astc/astc_decode.h" +#include "compressonator.h" extern CMP_BOOL g_LibraryInitialized; diff --git a/cmp_compressonatorlib/astc/codec_astc.cpp b/cmp_compressonatorlib/astc/codec_astc.cpp index 794deaf74..d1091ba50 100644 --- a/cmp_compressonatorlib/astc/codec_astc.cpp +++ b/cmp_compressonatorlib/astc/codec_astc.cpp @@ -31,20 +31,20 @@ #pragma warning(disable:4101) // Ignore warnings of unreferenced local variable #pragma warning(disable:4996) // This function or variable may be unsafe -#include "Common.h" -#include "Compressonator.h" +#include "common.h" +#include "compressonator.h" -#include "ASTC/Codec_ASTC.h" -#include "ASTC/ASTC_Library.h" +#include "astc/codec_astc.h" +#include "astc/astc_library.h" -#include "ASTC/ARM/astc_codec_internals.h" +#include "astc/arm/astc_codec_internals.h" #include "debug.h" #include #include #ifdef ASTC_COMPDEBUGGER -#include "CompClient.h" +#include "compclient.h" extern CompViewerClient g_CompClient; #endif @@ -300,7 +300,7 @@ bool CCodec_ASTC::SetParameter(const CMP_CHAR* pszParamName, CODECFLOAT fValue) // it should set the exit flag in the parameters to allow the tread to quit // -#include "ASTC_Host.h" +#include "astc_host.h" ASTC_Encoder::ASTC_Encode g_ASTCEncode; diff --git a/cmp_compressonatorlib/astc/codec_astc.h b/cmp_compressonatorlib/astc/codec_astc.h index f639207b3..f2ab7b494 100644 --- a/cmp_compressonatorlib/astc/codec_astc.h +++ b/cmp_compressonatorlib/astc/codec_astc.h @@ -24,12 +24,12 @@ #if !defined(_CODEC_ASTC_H_INCLUDED_) #define _CODEC_ASTC_H_INCLUDED_ -#include "Compressonator.h" -#include "Codec_DXTC.h" -#include "ASTC_Encode.h" -#include "ASTC_Decode.h" -#include "ASTC_Library.h" -#include "ASTC_Definitions.h" +#include "compressonator.h" +#include "codec_dxtc.h" +#include "astc_encode.h" +#include "astc_decode.h" +#include "astc_library.h" +#include "astc_definitions.h" #include diff --git a/cmp_compressonatorlib/atc/codec_atc.cpp b/cmp_compressonatorlib/atc/codec_atc.cpp index ae9ba1700..87d2cdfd6 100644 --- a/cmp_compressonatorlib/atc/codec_atc.cpp +++ b/cmp_compressonatorlib/atc/codec_atc.cpp @@ -27,10 +27,10 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_ATC.h" -#include "Compressonator_tc.h" -#include "CompressonatorXCodec.h" +#include "common.h" +#include "codec_atc.h" +#include "compressonator_tc.h" +#include "compressonatorxcodec.h" using namespace CMP; diff --git a/cmp_compressonatorlib/atc/codec_atc.h b/cmp_compressonatorlib/atc/codec_atc.h index 728f84fac..f5f2c5b0f 100644 --- a/cmp_compressonatorlib/atc/codec_atc.h +++ b/cmp_compressonatorlib/atc/codec_atc.h @@ -25,7 +25,7 @@ #ifndef _CODEC_ATC_H_INCLUDED_ #define _CODEC_ATC_H_INCLUDED_ -#include "Codec_Block_4x4.h" +#include "codec_block_4x4.h" #define ATC_OFFSET_ALPHA 0 #define ATC_OFFSET_RGB 2 diff --git a/cmp_compressonatorlib/atc/codec_atc_rgb.cpp b/cmp_compressonatorlib/atc/codec_atc_rgb.cpp index 04202a365..41fb6ca89 100644 --- a/cmp_compressonatorlib/atc/codec_atc_rgb.cpp +++ b/cmp_compressonatorlib/atc/codec_atc_rgb.cpp @@ -28,9 +28,9 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_ATC_RGB.h" -#include "Compressonator_tc.h" +#include "common.h" +#include "codec_atc_rgb.h" +#include "compressonator_tc.h" using namespace CMP; diff --git a/cmp_compressonatorlib/atc/codec_atc_rgb.h b/cmp_compressonatorlib/atc/codec_atc_rgb.h index 9b2373e8a..f6a877ac3 100644 --- a/cmp_compressonatorlib/atc/codec_atc_rgb.h +++ b/cmp_compressonatorlib/atc/codec_atc_rgb.h @@ -29,7 +29,7 @@ #ifndef _CODEC_ATC_RGB_H_INCLUDED_ #define _CODEC_ATC_RGB_H_INCLUDED_ -#include "Codec_ATC.h" +#include "codec_atc.h" class CCodec_ATC_RGB : public CCodec_ATC { public: diff --git a/cmp_compressonatorlib/atc/codec_atc_rgba_explicit.cpp b/cmp_compressonatorlib/atc/codec_atc_rgba_explicit.cpp index f959dede5..e4948a449 100644 --- a/cmp_compressonatorlib/atc/codec_atc_rgba_explicit.cpp +++ b/cmp_compressonatorlib/atc/codec_atc_rgba_explicit.cpp @@ -28,8 +28,8 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_ATC_RGBA_Explicit.h" +#include "common.h" +#include "codec_atc_rgba_explicit.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/atc/codec_atc_rgba_explicit.h b/cmp_compressonatorlib/atc/codec_atc_rgba_explicit.h index c3812e924..696335c58 100644 --- a/cmp_compressonatorlib/atc/codec_atc_rgba_explicit.h +++ b/cmp_compressonatorlib/atc/codec_atc_rgba_explicit.h @@ -29,7 +29,7 @@ #ifndef _CODEC_ATC_RGBA_H_INCLUDED_ #define _CODEC_ATC_RGBA_H_INCLUDED_ -#include "Codec_ATC.h" +#include "codec_atc.h" class CCodec_ATC_RGBA_Explicit : public CCodec_ATC { public: diff --git a/cmp_compressonatorlib/atc/codec_atc_rgba_interpolated.cpp b/cmp_compressonatorlib/atc/codec_atc_rgba_interpolated.cpp index 1b6ed5ddd..b71a9f8e5 100644 --- a/cmp_compressonatorlib/atc/codec_atc_rgba_interpolated.cpp +++ b/cmp_compressonatorlib/atc/codec_atc_rgba_interpolated.cpp @@ -28,8 +28,8 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_ATC_RGBA_Interpolated.h" +#include "common.h" +#include "codec_atc_rgba_interpolated.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/atc/codec_atc_rgba_interpolated.h b/cmp_compressonatorlib/atc/codec_atc_rgba_interpolated.h index fc694ba36..0490b2acc 100644 --- a/cmp_compressonatorlib/atc/codec_atc_rgba_interpolated.h +++ b/cmp_compressonatorlib/atc/codec_atc_rgba_interpolated.h @@ -29,7 +29,7 @@ #ifndef _CODEC_ATC_RGBA_INTERP_H_INCLUDED_ #define _CODEC_ATC_RGBA_INTERP_H_INCLUDED_ -#include "Codec_ATC.h" +#include "codec_atc.h" class CCodec_ATC_RGBA_Interpolated : public CCodec_ATC { public: diff --git a/cmp_compressonatorlib/ati/codec_ati1n.cpp b/cmp_compressonatorlib/ati/codec_ati1n.cpp index 4347bee81..81477adf7 100644 --- a/cmp_compressonatorlib/ati/codec_ati1n.cpp +++ b/cmp_compressonatorlib/ati/codec_ati1n.cpp @@ -28,11 +28,11 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_ATI1N.h" +#include "common.h" +#include "codec_ati1n.h" #ifdef TEST_CMP_CORE_DECODER -#include "CMP_Core.h" +#include "cmp_core.h" #endif ////////////////////////////////////////////////////////////////////////////// diff --git a/cmp_compressonatorlib/ati/codec_ati1n.h b/cmp_compressonatorlib/ati/codec_ati1n.h index 5373ae2b8..a30207092 100644 --- a/cmp_compressonatorlib/ati/codec_ati1n.h +++ b/cmp_compressonatorlib/ati/codec_ati1n.h @@ -29,7 +29,7 @@ #ifndef _CODEC_ATI1N_H_INCLUDED_ #define _CODEC_ATI1N_H_INCLUDED_ -#include "Codec_DXTC.h" +#include "codec_dxtc.h" class CCodec_ATI1N : public CCodec_DXTC { public: diff --git a/cmp_compressonatorlib/ati/codec_ati2n.cpp b/cmp_compressonatorlib/ati/codec_ati2n.cpp index 70e0926a3..ed456137f 100644 --- a/cmp_compressonatorlib/ati/codec_ati2n.cpp +++ b/cmp_compressonatorlib/ati/codec_ati2n.cpp @@ -28,11 +28,11 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_ATI2N.h" +#include "common.h" +#include "codec_ati2n.h" #ifdef TEST_CMP_CORE_DECODER -#include "CMP_Core.h" +#include "cmp_core.h" #endif ////////////////////////////////////////////////////////////////////////////// diff --git a/cmp_compressonatorlib/ati/codec_ati2n.h b/cmp_compressonatorlib/ati/codec_ati2n.h index 9bc3a2247..f321b8af8 100644 --- a/cmp_compressonatorlib/ati/codec_ati2n.h +++ b/cmp_compressonatorlib/ati/codec_ati2n.h @@ -29,7 +29,7 @@ #ifndef _CODEC_ATI2N_H_INCLUDED_ #define _CODEC_ATI2N_H_INCLUDED_ -#include "Codec_DXTC.h" +#include "codec_dxtc.h" class CCodec_ATI2N : public CCodec_DXTC { public: diff --git a/cmp_compressonatorlib/ati/codec_ati2n_dxt5.cpp b/cmp_compressonatorlib/ati/codec_ati2n_dxt5.cpp index 6bb9e7b23..0a2f36695 100644 --- a/cmp_compressonatorlib/ati/codec_ati2n_dxt5.cpp +++ b/cmp_compressonatorlib/ati/codec_ati2n_dxt5.cpp @@ -28,8 +28,8 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_ATI2N_DXT5.h" +#include "common.h" +#include "codec_ati2n_dxt5.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/ati/codec_ati2n_dxt5.h b/cmp_compressonatorlib/ati/codec_ati2n_dxt5.h index ac265bc03..86c9bfc38 100644 --- a/cmp_compressonatorlib/ati/codec_ati2n_dxt5.h +++ b/cmp_compressonatorlib/ati/codec_ati2n_dxt5.h @@ -29,7 +29,7 @@ #ifndef _Codec_ATI2N_DXT5_H_INCLUDED_ #define _Codec_ATI2N_DXT5_H_INCLUDED_ -#include "Codec_ATI2N.h" +#include "codec_ati2n.h" class CCodec_ATI2N_DXT5 : public CCodec_ATI2N { public: diff --git a/cmp_compressonatorlib/ati/codec_ati_tc.cpp b/cmp_compressonatorlib/ati/codec_ati_tc.cpp index 49e7c443a..e5548150c 100644 --- a/cmp_compressonatorlib/ati/codec_ati_tc.cpp +++ b/cmp_compressonatorlib/ati/codec_ati_tc.cpp @@ -23,7 +23,7 @@ // #ifdef SUPPORT_ATI_TC -#include "Codec_ATI_TC.h" +#include "codec_ati_tc.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/ati/compressonatori_tc.c b/cmp_compressonatorlib/ati/compressonatori_tc.c index 0e49936c8..240dfd4a9 100644 --- a/cmp_compressonatorlib/ati/compressonatori_tc.c +++ b/cmp_compressonatorlib/ati/compressonatori_tc.c @@ -34,7 +34,7 @@ #include #endif #include -#include "Compressonator_tc.h" +#include "compressonator_tc.h" #ifndef BOOL typedef int BOOL; diff --git a/cmp_compressonatorlib/ati/compressonatorxcodec.cpp b/cmp_compressonatorlib/ati/compressonatorxcodec.cpp index 59e60f754..f1a0146bd 100644 --- a/cmp_compressonatorlib/ati/compressonatorxcodec.cpp +++ b/cmp_compressonatorlib/ati/compressonatorxcodec.cpp @@ -28,7 +28,7 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" +#include "common.h" using namespace CMP; @@ -39,9 +39,9 @@ using namespace CMP; #include #endif // USE_SSE -#include "Codec.h" +#include "codec.h" -#include "CompressonatorXCodec.h" +#include "compressonatorxcodec.h" #if defined(WIN32) || defined(_WIN64) # define ALIGN_16 __declspec(align(16)) diff --git a/cmp_compressonatorlib/basis/codec_basis.cpp b/cmp_compressonatorlib/basis/codec_basis.cpp index 83edf8b69..9db26aee0 100644 --- a/cmp_compressonatorlib/basis/codec_basis.cpp +++ b/cmp_compressonatorlib/basis/codec_basis.cpp @@ -28,14 +28,14 @@ #pragma warning(disable:4100) // Ignore warnings of unreferenced formal parameters -#include "Compressonator.h" +#include "compressonator.h" #ifdef USE_BASIS #ifdef _WIN32 -#include "Common.h" -#include "Codec_BASIS.h" +#include "common.h" +#include "codec_basis.h" #include #include "debug.h" diff --git a/cmp_compressonatorlib/basis/codec_basis.h b/cmp_compressonatorlib/basis/codec_basis.h index 318d67954..e957b6e0e 100644 --- a/cmp_compressonatorlib/basis/codec_basis.h +++ b/cmp_compressonatorlib/basis/codec_basis.h @@ -28,11 +28,11 @@ #ifndef _CODEC_BASIS_H_INCLUDED_ #define _CODEC_BASIS_H_INCLUDED_ -#include "Compressonator.h" +#include "compressonator.h" #ifdef USE_BASIS -#include "Codec_DXTC.h" +#include "codec_dxtc.h" class CCodec_BASIS : public CCodec_DXTC { public: diff --git a/cmp_compressonatorlib/bc6h/bc6h_decode.cpp b/cmp_compressonatorlib/bc6h/bc6h_decode.cpp index cfa5b7638..35bdff999 100644 --- a/cmp_compressonatorlib/bc6h/bc6h_decode.cpp +++ b/cmp_compressonatorlib/bc6h/bc6h_decode.cpp @@ -29,17 +29,16 @@ #include #include "debug.h" -#include "Common.h" -#include "HDR_Encode.h" -#include "BC6H_Definitions.h" -#include "BC6H_Decode.h" -#include "BC6H_utils.h" -#include "BC6H_Decode.h" +#include "common.h" +#include "hdr_encode.h" +#include "bc6h_definitions.h" +#include "bc6h_decode.h" +#include "bc6h_utils.h" #include #include #ifdef TEST_CMP_CORE_DECODER -#include "CMP_Core.h" +#include "cmp_core.h" #endif #ifdef BC6H_DECODE_DEBUG diff --git a/cmp_compressonatorlib/bc6h/bc6h_decode.h b/cmp_compressonatorlib/bc6h/bc6h_decode.h index 12e49c31e..ad6f844ba 100644 --- a/cmp_compressonatorlib/bc6h/bc6h_decode.h +++ b/cmp_compressonatorlib/bc6h/bc6h_decode.h @@ -26,8 +26,8 @@ #define _BC6H_DECODE_H_ #include -#include "BC6H_Library.h" -#include "BC6H_Definitions.h" +#include "bc6h_library.h" +#include "bc6h_definitions.h" class BC6HBlockDecoder { public: diff --git a/cmp_compressonatorlib/bc6h/bc6h_definitions.cpp b/cmp_compressonatorlib/bc6h/bc6h_definitions.cpp index d350f1f59..7a6d646ce 100644 --- a/cmp_compressonatorlib/bc6h/bc6h_definitions.cpp +++ b/cmp_compressonatorlib/bc6h/bc6h_definitions.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // -#include "BC6H_Definitions.h" +#include "bc6h_definitions.h" unsigned short g_BC6H_FORMAT = UNSIGNED_F16; diff --git a/cmp_compressonatorlib/bc6h/bc6h_definitions.h b/cmp_compressonatorlib/bc6h/bc6h_definitions.h index 6c3682039..ea224089e 100644 --- a/cmp_compressonatorlib/bc6h/bc6h_definitions.h +++ b/cmp_compressonatorlib/bc6h/bc6h_definitions.h @@ -25,7 +25,7 @@ #ifndef _BC6H_DEFINITIONS_H_ #define _BC6H_DEFINITIONS_H_ -#include "HDR_Encode.h" +#include "hdr_encode.h" #include #include diff --git a/cmp_compressonatorlib/bc6h/bc6h_encode.cpp b/cmp_compressonatorlib/bc6h/bc6h_encode.cpp index 4442c2f1a..d63178387 100644 --- a/cmp_compressonatorlib/bc6h/bc6h_encode.cpp +++ b/cmp_compressonatorlib/bc6h/bc6h_encode.cpp @@ -28,15 +28,15 @@ // #include #include "debug.h" -#include "BC6H_Encode.h" +#include "bc6h_encode.h" #include #include #include -#include "Common.h" -#include "HDR_Encode.h" -#include "BC6H_Definitions.h" -#include "BC6H_Encode.h" -#include "BC6H_utils.h" +#include "common.h" +#include "hdr_encode.h" +#include "bc6h_definitions.h" +#include "bc6h_encode.h" +#include "bc6h_utils.h" using namespace HDR_Encode; diff --git a/cmp_compressonatorlib/bc6h/bc6h_encode.h b/cmp_compressonatorlib/bc6h/bc6h_encode.h index a192de881..b62454f99 100644 --- a/cmp_compressonatorlib/bc6h/bc6h_encode.h +++ b/cmp_compressonatorlib/bc6h/bc6h_encode.h @@ -25,8 +25,8 @@ #ifndef _BC6H_ENCODE_H_ #define _BC6H_ENCODE_H_ -#include "Compressonator.h" -#include "BC6H_Definitions.h" +#include "compressonator.h" +#include "bc6h_definitions.h" #include diff --git a/cmp_compressonatorlib/bc6h/bc6h_library.cpp b/cmp_compressonatorlib/bc6h/bc6h_library.cpp index 27bf54dc8..745e78f3e 100644 --- a/cmp_compressonatorlib/bc6h/bc6h_library.cpp +++ b/cmp_compressonatorlib/bc6h/bc6h_library.cpp @@ -21,11 +21,11 @@ // THE SOFTWARE. // -#include "BC7_Definitions.h" -#include "BC6H_Definitions.h" -#include "BC6H_Encode.h" -#include "BC6H_Decode.h" -#include "Compressonator.h" +#include "bc7_definitions.h" +#include "bc6h_definitions.h" +#include "bc6h_encode.h" +#include "bc6h_decode.h" +#include "compressonator.h" extern bool g_LibraryInitialized; diff --git a/cmp_compressonatorlib/bc6h/bc6h_library.h b/cmp_compressonatorlib/bc6h/bc6h_library.h index dc185f114..86259a7e6 100644 --- a/cmp_compressonatorlib/bc6h/bc6h_library.h +++ b/cmp_compressonatorlib/bc6h/bc6h_library.h @@ -31,8 +31,8 @@ #ifndef _BC6H_LIBRARY_H_ #define _BC6H_LIBRARY_H_ -#include "Compressonator.h" -#include "BC6H_Definitions.h" +#include "compressonator.h" +#include "bc6h_definitions.h" // Maximum number of threads supported by the compressor #define BC6H_MAX_THREADS 128 diff --git a/cmp_compressonatorlib/bc6h/bc6h_utils.cpp b/cmp_compressonatorlib/bc6h/bc6h_utils.cpp index 2f9365434..9bcc9e5df 100644 --- a/cmp_compressonatorlib/bc6h/bc6h_utils.cpp +++ b/cmp_compressonatorlib/bc6h/bc6h_utils.cpp @@ -28,6 +28,6 @@ // #include -#include "BC6H_Definitions.h" -#include "BC6H_utils.h" +#include "bc6h_definitions.h" +#include "bc6h_utils.h" diff --git a/cmp_compressonatorlib/bc6h/bc6h_utils.h b/cmp_compressonatorlib/bc6h/bc6h_utils.h index a957a3649..ebc30c988 100644 --- a/cmp_compressonatorlib/bc6h/bc6h_utils.h +++ b/cmp_compressonatorlib/bc6h/bc6h_utils.h @@ -28,7 +28,7 @@ #ifndef _BC6H_UTILS_H_ #define _BC6H_UTILS_H_ -#include "BC6H_Definitions.h" +#include "bc6h_definitions.h" #include #include diff --git a/cmp_compressonatorlib/bc6h/codec_bc6h.cpp b/cmp_compressonatorlib/bc6h/codec_bc6h.cpp index 7cd308062..087f035d0 100644 --- a/cmp_compressonatorlib/bc6h/codec_bc6h.cpp +++ b/cmp_compressonatorlib/bc6h/codec_bc6h.cpp @@ -27,19 +27,19 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable : 4100) // Ignore warnings of unreferenced formal parameters -#include "Common.h" -#include "Codec_BC6H.h" -#include "BC7_Definitions.h" -#include "BC6H_Library.h" -#include "BC6H_Definitions.h" -#include "HDR_Encode.h" +#include "common.h" +#include "codec_bc6h.h" +#include "bc7_definitions.h" +#include "bc6h_library.h" +#include "bc6h_definitions.h" +#include "hdr_encode.h" #include using namespace HDR_Encode; #ifdef BC6H_COMPDEBUGGER -#include "CompClient.h" +#include "compclient.h" extern CompViewerClient g_CompClient; #endif diff --git a/cmp_compressonatorlib/bc6h/codec_bc6h.h b/cmp_compressonatorlib/bc6h/codec_bc6h.h index 8c123e8dc..c0346b018 100644 --- a/cmp_compressonatorlib/bc6h/codec_bc6h.h +++ b/cmp_compressonatorlib/bc6h/codec_bc6h.h @@ -28,11 +28,11 @@ #if !defined(_CODEC_BC6H_H_INCLUDED_) #define _CODEC_BC6H_H_INCLUDED_ -#include "Compressonator.h" -#include "Codec_DXTC.h" -#include "BC6H_Encode.h" -#include "BC6H_Decode.h" -#include "BC6H_Library.h" +#include "compressonator.h" +#include "codec_dxtc.h" +#include "bc6h_encode.h" +#include "bc6h_decode.h" +#include "bc6h_library.h" #include diff --git a/cmp_compressonatorlib/bc7/3dquant_vpc.cpp b/cmp_compressonatorlib/bc7/3dquant_vpc.cpp index 1a0d22f73..44dffecc1 100644 --- a/cmp_compressonatorlib/bc7/3dquant_vpc.cpp +++ b/cmp_compressonatorlib/bc7/3dquant_vpc.cpp @@ -26,10 +26,10 @@ #include #include #include -#include "Common.h" +#include "common.h" #include "3dquant_constants.h" #include "3dquant_vpc.h" -#include "BC7_Definitions.h" +#include "bc7_definitions.h" #include "debug.h" #include diff --git a/cmp_compressonatorlib/bc7/bc7_decode.cpp b/cmp_compressonatorlib/bc7/bc7_decode.cpp index 377b5c9c6..9c35eb1ca 100644 --- a/cmp_compressonatorlib/bc7/bc7_decode.cpp +++ b/cmp_compressonatorlib/bc7/bc7_decode.cpp @@ -25,15 +25,15 @@ // BC7_Decode.cpp : A reference decoder for BC7 // -#include "BC7_Definitions.h" -#include "BC7_Partitions.h" -#include "BC7_Decode.h" -#include "BC7_utils.h" +#include "bc7_definitions.h" +#include "bc7_partitions.h" +#include "bc7_decode.h" +#include "bc7_utils.h" -#include "Common.h" +#include "common.h" #ifdef TEST_CMP_CORE_DECODER -#include "CMP_Core.h" +#include "cmp_core.h" #endif // Enable this to print info about the decoded blocks diff --git a/cmp_compressonatorlib/bc7/bc7_decode.h b/cmp_compressonatorlib/bc7/bc7_decode.h index 39d49db89..88160dc12 100644 --- a/cmp_compressonatorlib/bc7/bc7_decode.h +++ b/cmp_compressonatorlib/bc7/bc7_decode.h @@ -24,7 +24,7 @@ #ifndef _BC7_DECODE_H_ #define _BC7_DECODE_H_ -#include "BC7_Definitions.h" +#include "bc7_definitions.h" class BC7BlockDecoder { public: diff --git a/cmp_compressonatorlib/bc7/bc7_definitions.cpp b/cmp_compressonatorlib/bc7/bc7_definitions.cpp index ed70e42e3..412ed81f6 100644 --- a/cmp_compressonatorlib/bc7/bc7_definitions.cpp +++ b/cmp_compressonatorlib/bc7/bc7_definitions.cpp @@ -22,7 +22,7 @@ // THE SOFTWARE. // -#include "BC7_Definitions.h" +#include "bc7_definitions.h" // // Block encoding information for all block types diff --git a/cmp_compressonatorlib/bc7/bc7_definitions.h b/cmp_compressonatorlib/bc7/bc7_definitions.h index 762f9504d..5acd4c09f 100644 --- a/cmp_compressonatorlib/bc7/bc7_definitions.h +++ b/cmp_compressonatorlib/bc7/bc7_definitions.h @@ -24,7 +24,7 @@ #ifndef _BC7_DEFINITIONS_H_ #define _BC7_DEFINITIONS_H_ -#include "Compressonator.h" +#include "compressonator.h" #include "3dquant_constants.h" @@ -107,6 +107,6 @@ typedef struct { extern CMP_BTI bti[NUM_BLOCK_TYPES]; -#include "MathMacros.h" +#include "mathmacros.h" #endif \ No newline at end of file diff --git a/cmp_compressonatorlib/bc7/bc7_encode.cpp b/cmp_compressonatorlib/bc7/bc7_encode.cpp index b5d3eb183..dcf411fff 100644 --- a/cmp_compressonatorlib/bc7/bc7_encode.cpp +++ b/cmp_compressonatorlib/bc7/bc7_encode.cpp @@ -29,11 +29,11 @@ #include #include #include -#include "Common.h" -#include "BC7_Definitions.h" -#include "BC7_Partitions.h" -#include "BC7_Encode.h" -#include "BC7_utils.h" +#include "common.h" +#include "bc7_definitions.h" +#include "bc7_partitions.h" +#include "bc7_encode.h" +#include "bc7_utils.h" #include "3dquant_vpc.h" #include "shake.h" #include "debug.h" diff --git a/cmp_compressonatorlib/bc7/bc7_encode.h b/cmp_compressonatorlib/bc7/bc7_encode.h index 34482f3e5..58b19dd32 100644 --- a/cmp_compressonatorlib/bc7/bc7_encode.h +++ b/cmp_compressonatorlib/bc7/bc7_encode.h @@ -25,7 +25,7 @@ #define _BC7_ENCODE_H_ #include -#include "BC7_Definitions.h" +#include "bc7_definitions.h" #include "debug.h" #include diff --git a/cmp_compressonatorlib/bc7/bc7_library.cpp b/cmp_compressonatorlib/bc7/bc7_library.cpp index 69e28e3dc..c1a131e5d 100644 --- a/cmp_compressonatorlib/bc7/bc7_library.cpp +++ b/cmp_compressonatorlib/bc7/bc7_library.cpp @@ -22,13 +22,13 @@ // THE SOFTWARE. // -#include "BC7_Definitions.h" -#include "BC7_Encode.h" -#include "BC7_Decode.h" +#include "bc7_definitions.h" +#include "bc7_encode.h" +#include "bc7_decode.h" #include "3dquant_vpc.h" #include "shake.h" -#include "Compressonator.h" -#include "HDR_Encode.h" +#include "compressonator.h" +#include "hdr_encode.h" CMP_BOOL g_LibraryInitialized = FALSE; diff --git a/cmp_compressonatorlib/bc7/bc7_partitions.cpp b/cmp_compressonatorlib/bc7/bc7_partitions.cpp index 7935876aa..b6e248be7 100644 --- a/cmp_compressonatorlib/bc7/bc7_partitions.cpp +++ b/cmp_compressonatorlib/bc7/bc7_partitions.cpp @@ -22,7 +22,7 @@ // THE SOFTWARE. // -#include "BC7_Partitions.h" +#include "bc7_partitions.h" // // Verified to match the final definitions as detailedin the OpenGL BPTC spec diff --git a/cmp_compressonatorlib/bc7/bc7_partitions.h b/cmp_compressonatorlib/bc7/bc7_partitions.h index 84d807e75..a20d222fa 100644 --- a/cmp_compressonatorlib/bc7/bc7_partitions.h +++ b/cmp_compressonatorlib/bc7/bc7_partitions.h @@ -24,7 +24,7 @@ #ifndef _BC7_PARTITIONS_H_ #define _BC7_PARTITIONS_H_ -#include "BC7_Definitions.h" +#include "bc7_definitions.h" #include "debug.h" extern CMP_DWORD BC7_PARTITIONS[MAX_SUBSETS][MAX_PARTITIONS][MAX_SUBSET_SIZE]; diff --git a/cmp_compressonatorlib/bc7/bc7_utils.cpp b/cmp_compressonatorlib/bc7/bc7_utils.cpp index 4bd0c1828..99dcc38b1 100644 --- a/cmp_compressonatorlib/bc7/bc7_utils.cpp +++ b/cmp_compressonatorlib/bc7/bc7_utils.cpp @@ -23,8 +23,8 @@ // #include -#include "BC7_Definitions.h" -#include "BC7_utils.h" +#include "bc7_definitions.h" +#include "bc7_utils.h" #include "debug.h" // diff --git a/cmp_compressonatorlib/bc7/bc7_utils.h b/cmp_compressonatorlib/bc7/bc7_utils.h index 4055f05e6..301433379 100644 --- a/cmp_compressonatorlib/bc7/bc7_utils.h +++ b/cmp_compressonatorlib/bc7/bc7_utils.h @@ -24,7 +24,7 @@ #ifndef _BC7_UTILS_H_ #define _BC7_UTILS_H_ -#include "BC7_Definitions.h" +#include "bc7_definitions.h" extern void WriteBit(CMP_BYTE *base, int offset, diff --git a/cmp_compressonatorlib/bc7/codec_bc7.cpp b/cmp_compressonatorlib/bc7/codec_bc7.cpp index 671dd1342..696c56722 100644 --- a/cmp_compressonatorlib/bc7/codec_bc7.cpp +++ b/cmp_compressonatorlib/bc7/codec_bc7.cpp @@ -27,13 +27,13 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) // Ignore warnings of unreferenced formal parameters -#include "Common.h" -#include "Codec_BC7.h" -#include "BC7_Library.h" +#include "common.h" +#include "codec_bc7.h" +#include "bc7_library.h" #include #ifdef BC7_COMPDEBUGGER -#include "CompClient.h" +#include "compclient.h" #endif #ifdef BC7_COMPDEBUGGER diff --git a/cmp_compressonatorlib/bc7/codec_bc7.h b/cmp_compressonatorlib/bc7/codec_bc7.h index 3551b7b19..f7c379357 100644 --- a/cmp_compressonatorlib/bc7/codec_bc7.h +++ b/cmp_compressonatorlib/bc7/codec_bc7.h @@ -28,11 +28,11 @@ #ifndef _CODEC_BC7_H_INCLUDED_ #define _CODEC_BC7_H_INCLUDED_ -#include "Compressonator.h" -#include "Codec_DXTC.h" -#include "BC7_Encode.h" -#include "BC7_Decode.h" -#include "BC7_Library.h" +#include "compressonator.h" +#include "codec_dxtc.h" +#include "bc7_encode.h" +#include "bc7_decode.h" +#include "bc7_library.h" #include // #define USE_THREADED_CALLBACKS // This is experimental code to improve compression performance! diff --git a/cmp_compressonatorlib/bc7/reconstruct.h b/cmp_compressonatorlib/bc7/reconstruct.h index 81c35bf65..92a4d3091 100644 --- a/cmp_compressonatorlib/bc7/reconstruct.h +++ b/cmp_compressonatorlib/bc7/reconstruct.h @@ -24,7 +24,7 @@ #ifndef RECONSTRUCT_H_INCLUDED #define RECONSTRUCT_H_INCLUDED -#include "BC7_Definitions.h" +#include "bc7_definitions.h" // continious recoustruction unclumped /*********************************/ diff --git a/cmp_compressonatorlib/bc7/shake.cpp b/cmp_compressonatorlib/bc7/shake.cpp index c1416f6a0..370841a7a 100644 --- a/cmp_compressonatorlib/bc7/shake.cpp +++ b/cmp_compressonatorlib/bc7/shake.cpp @@ -29,9 +29,9 @@ #include "3dquant_constants.h" #include "3dquant_vpc.h" #include "shake.h" -#include "BC7_utils.h" +#include "bc7_utils.h" #include "debug.h" -#include "BC7_Encode.h" +#include "bc7_encode.h" #define LOG_CL_BASE 2 #define BIT_BASE 5 diff --git a/cmp_compressonatorlib/block/codec_block.cpp b/cmp_compressonatorlib/block/codec_block.cpp index 6d7880265..b837369de 100644 --- a/cmp_compressonatorlib/block/codec_block.cpp +++ b/cmp_compressonatorlib/block/codec_block.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_Block.h" +#include "common.h" +#include "codec_block.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/block/codec_block.h b/cmp_compressonatorlib/block/codec_block.h index 4f575f058..e0ef00bcb 100644 --- a/cmp_compressonatorlib/block/codec_block.h +++ b/cmp_compressonatorlib/block/codec_block.h @@ -29,7 +29,7 @@ #ifndef _CODEC_BLOCK_H_INCLUDED_ #define _CODEC_BLOCK_H_INCLUDED_ -#include "Codec.h" +#include "codec.h" class CCodec_Block : public CCodec { public: diff --git a/cmp_compressonatorlib/block/codec_block_4x4.cpp b/cmp_compressonatorlib/block/codec_block_4x4.cpp index f9acb14ff..45094638a 100644 --- a/cmp_compressonatorlib/block/codec_block_4x4.cpp +++ b/cmp_compressonatorlib/block/codec_block_4x4.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_Block_4x4.h" +#include "common.h" +#include "codec_block_4x4.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/block/codec_block_4x4.h b/cmp_compressonatorlib/block/codec_block_4x4.h index b2738c34b..76b0ea636 100644 --- a/cmp_compressonatorlib/block/codec_block_4x4.h +++ b/cmp_compressonatorlib/block/codec_block_4x4.h @@ -29,7 +29,7 @@ #ifndef _CODEC_BLOCK_4x4_H_INCLUDED_ #define _CODEC_BLOCK_4x4_H_INCLUDED_ -#include "Codec_Block.h" +#include "codec_block.h" class CCodec_Block_4x4 : public CCodec_Block { public: diff --git a/cmp_compressonatorlib/block/codec_block_8x8.cpp b/cmp_compressonatorlib/block/codec_block_8x8.cpp index 1481fc1ad..4ecd5e304 100644 --- a/cmp_compressonatorlib/block/codec_block_8x8.cpp +++ b/cmp_compressonatorlib/block/codec_block_8x8.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_Block_8x8.h" +#include "common.h" +#include "codec_block_8x8.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/block/codec_block_8x8.h b/cmp_compressonatorlib/block/codec_block_8x8.h index af5e16174..fff94c885 100644 --- a/cmp_compressonatorlib/block/codec_block_8x8.h +++ b/cmp_compressonatorlib/block/codec_block_8x8.h @@ -29,7 +29,7 @@ #ifndef _CODEC_BLOCK_8x8_H_INCLUDED_ #define _CODEC_BLOCK_8x8_H_INCLUDED_ -#include "Codec_Block.h" +#include "codec_block.h" class CCodec_Block_8x8 : public CCodec_Block { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer.cpp b/cmp_compressonatorlib/buffer/codecbuffer.cpp index a12b38f65..119f9ab20 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer.cpp @@ -27,27 +27,27 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer.h" -#include "CodecBuffer_RGBA8888.h" -#include "CodecBuffer_RGB888.h" -#include "CodecBuffer_RG8.h" -#include "CodecBuffer_R8.h" -#include "CodecBuffer_RGBA2101010.h" -#include "CodecBuffer_RGBA16.h" -#include "CodecBuffer_RG16.h" -#include "CodecBuffer_R16.h" -#include "CodecBuffer_RGBA32.h" -#include "CodecBuffer_RG32.h" -#include "CodecBuffer_R32.h" -#include "CodecBuffer_RGBA16F.h" -#include "CodecBuffer_RG16F.h" -#include "CodecBuffer_R16F.h" -#include "CodecBuffer_RGBA32F.h" -#include "CodecBuffer_RG32F.h" -#include "CodecBuffer_R32F.h" -#include "CodecBuffer_Block.h" -#include "CodecBuffer_RGB9995EF.h" +#include "common.h" +#include "codecbuffer.h" +#include "codecbuffer_rgba8888.h" +#include "codecbuffer_rgb888.h" +#include "codecbuffer_rg8.h" +#include "codecbuffer_r8.h" +#include "codecbuffer_rgba2101010.h" +#include "codecbuffer_rgba16.h" +#include "codecbuffer_rg16.h" +#include "codecbuffer_r16.h" +#include "codecbuffer_rgba32.h" +#include "codecbuffer_rg32.h" +#include "codecbuffer_r32.h" +#include "codecbuffer_rgba16f.h" +#include "codecbuffer_rg16f.h" +#include "codecbuffer_r16f.h" +#include "codecbuffer_rgba32f.h" +#include "codecbuffer_rg32f.h" +#include "codecbuffer_r32f.h" +#include "codecbuffer_block.h" +#include "codecbuffer_rgb9995ef.h" CCodecBuffer* CreateCodecBuffer(CodecBufferType nCodecBufferType, diff --git a/cmp_compressonatorlib/buffer/codecbuffer.h b/cmp_compressonatorlib/buffer/codecbuffer.h index fd93ddee4..f5e20e445 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer.h +++ b/cmp_compressonatorlib/buffer/codecbuffer.h @@ -30,9 +30,9 @@ #define _CODECBUFFER_H_INCLUDED_ #include "debug.h" -#include "Common.h" -#include "Compressonator.h" -#include "MathMacros.h" +#include "common.h" +#include "compressonator.h" +#include "mathmacros.h" diff --git a/cmp_compressonatorlib/buffer/codecbuffer_block.cpp b/cmp_compressonatorlib/buffer/codecbuffer_block.cpp index 1e58186d1..ea07b6cc3 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_block.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_block.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_Block.h" +#include "common.h" +#include "codecbuffer_block.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_block.h b/cmp_compressonatorlib/buffer/codecbuffer_block.h index 60bc8249a..bf902172a 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_block.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_block.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_BLOCK_H_INCLUDED_ #define _CODECBUFFER_BLOCK_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_Block : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_r16.cpp b/cmp_compressonatorlib/buffer/codecbuffer_r16.cpp index 45db5039e..479dacd19 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_r16.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_r16.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_R16.h" +#include "common.h" +#include "codecbuffer_r16.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_r16.h b/cmp_compressonatorlib/buffer/codecbuffer_r16.h index eef0b83f3..fb6ade162 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_r16.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_r16.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_R16_H_INCLUDED_ #define _CODECBUFFER_R16_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_R16 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_r16f.cpp b/cmp_compressonatorlib/buffer/codecbuffer_r16f.cpp index ffe0f339e..433d520f1 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_r16f.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_r16f.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_R16F.h" +#include "common.h" +#include "codecbuffer_r16f.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_r16f.h b/cmp_compressonatorlib/buffer/codecbuffer_r16f.h index 4ef273503..062e86b0d 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_r16f.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_r16f.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_R16F_H_INCLUDED_ #define _CODECBUFFER_R16F_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" #define CHANNEL_INDEX_R 0 diff --git a/cmp_compressonatorlib/buffer/codecbuffer_r32.cpp b/cmp_compressonatorlib/buffer/codecbuffer_r32.cpp index a3bed34ed..e941dfb55 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_r32.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_r32.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_R32.h" +#include "common.h" +#include "codecbuffer_r32.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_r32.h b/cmp_compressonatorlib/buffer/codecbuffer_r32.h index 2b732b51a..9bf7aca5e 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_r32.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_r32.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_R32_H_INCLUDED_ #define _CODECBUFFER_R32_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_R32 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_r32f.cpp b/cmp_compressonatorlib/buffer/codecbuffer_r32f.cpp index 0ffd3ef4c..ddc33f5bb 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_r32f.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_r32f.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_R32F.h" +#include "common.h" +#include "codecbuffer_r32f.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_r32f.h b/cmp_compressonatorlib/buffer/codecbuffer_r32f.h index 38472fd80..666836fa5 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_r32f.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_r32f.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_R32F_H_INCLUDED_ #define _CODECBUFFER_R32F_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" #define CHANNEL_INDEX_R 0 diff --git a/cmp_compressonatorlib/buffer/codecbuffer_r8.cpp b/cmp_compressonatorlib/buffer/codecbuffer_r8.cpp index a4829c99f..f3d5a63ef 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_r8.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_r8.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_R8.h" +#include "common.h" +#include "codecbuffer_r8.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_r8.h b/cmp_compressonatorlib/buffer/codecbuffer_r8.h index 99cf9bb6e..00dad938b 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_r8.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_r8.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_R8_H_INCLUDED_ #define _CODECBUFFER_R8_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_R8 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rg16.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rg16.cpp index a78478933..5d712b51d 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rg16.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rg16.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RG16.h" +#include "common.h" +#include "codecbuffer_rg16.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rg16.h b/cmp_compressonatorlib/buffer/codecbuffer_rg16.h index a14655bcb..ba67fb61c 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rg16.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rg16.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RG16_H_INCLUDED_ #define _CODECBUFFER_RG16_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_RG16 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rg16f.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rg16f.cpp index 2ac278b75..aafe54c97 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rg16f.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rg16f.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RG16F.h" +#include "common.h" +#include "codecbuffer_rg16f.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rg16f.h b/cmp_compressonatorlib/buffer/codecbuffer_rg16f.h index 730274626..cc120c4e1 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rg16f.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rg16f.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RG16F_H_INCLUDED_ #define _CODECBUFFER_RG16F_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" #define CHANNEL_INDEX_R 0 #define CHANNEL_INDEX_G 1 diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rg32.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rg32.cpp index 79dac74d0..c2d3e5bb8 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rg32.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rg32.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RG32.h" +#include "common.h" +#include "codecbuffer_rg32.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rg32.h b/cmp_compressonatorlib/buffer/codecbuffer_rg32.h index 0b8ed4895..02c64b2b3 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rg32.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rg32.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RG32_H_INCLUDED_ #define _CODECBUFFER_RG32_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_RG32 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rg32f.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rg32f.cpp index f926c113f..1ec174f41 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rg32f.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rg32f.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RG32F.h" +#include "common.h" +#include "codecbuffer_rg32f.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rg32f.h b/cmp_compressonatorlib/buffer/codecbuffer_rg32f.h index dcfbc34de..0ac50e41d 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rg32f.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rg32f.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RG32F_H_INCLUDED_ #define _CODECBUFFER_RG32F_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" #define CHANNEL_INDEX_R 0 #define CHANNEL_INDEX_G 1 diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rg8.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rg8.cpp index a389d49a7..e2cbce705 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rg8.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rg8.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RG8.h" +#include "common.h" +#include "codecbuffer_rg8.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rg8.h b/cmp_compressonatorlib/buffer/codecbuffer_rg8.h index 826821326..341ca7141 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rg8.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rg8.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RG8_H_INCLUDED_ #define _CODECBUFFER_RG8_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_RG8 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgb888.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rgb888.cpp index dae3b179a..e6f77c373 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgb888.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgb888.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RGB888.h" +#include "common.h" +#include "codecbuffer_rgb888.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgb888.h b/cmp_compressonatorlib/buffer/codecbuffer_rgb888.h index 7248b4865..b4a279e4a 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgb888.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgb888.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RGB888_H_INCLUDED_ #define _CODECBUFFER_RGB888_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_RGB888 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgb9995ef.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rgb9995ef.cpp index 133ae2fdb..ec75383a6 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgb9995ef.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgb9995ef.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RGB9995EF.h" +#include "common.h" +#include "codecbuffer_rgb9995ef.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgb9995ef.h b/cmp_compressonatorlib/buffer/codecbuffer_rgb9995ef.h index 832ca52dd..a71633cc1 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgb9995ef.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgb9995ef.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RGB9995EF_H_INCLUDED_ #define _CODECBUFFER_RGB9995EF_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" #define CHANNEL_INDEX_R 0 diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba16.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rgba16.cpp index 1da0aed85..5def2652f 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba16.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba16.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RGBA16.h" +#include "common.h" +#include "codecbuffer_rgba16.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba16.h b/cmp_compressonatorlib/buffer/codecbuffer_rgba16.h index cfc813ba2..4a3ccc4f5 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba16.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba16.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RGBA16_H_INCLUDED_ #define _CODECBUFFER_RGBA16_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_RGBA16 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba16f.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rgba16f.cpp index 8c4437b73..5c1ea1ba6 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba16f.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba16f.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RGBA16F.h" +#include "common.h" +#include "codecbuffer_rgba16f.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction @@ -41,7 +41,6 @@ CCodecBuffer_RGBA16F::CCodecBuffer_RGBA16F( CMP_BYTE nBlockWidth, CMP_BYTE nBlockHeight, CMP_BYTE nBlockDepth, CMP_DWORD dwWidth, CMP_DWORD dwHeight, CMP_DWORD dwPitch, CMP_BYTE* pData,CMP_DWORD dwDataSize) : CCodecBuffer(nBlockWidth, nBlockHeight, nBlockDepth,dwWidth, dwHeight, dwPitch, pData,dwDataSize) { - if (m_dwPitch == 0) printf(""); //int gw= GetWidth() * RGBA16F_nPixelSize; //assert((m_dwPitch == 0) || (m_dwPitch >= GetWidth() * RGBA16F_nPixelSize)); if(m_dwPitch <= GetWidth() * RGBA16F_nPixelSize) diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba16f.h b/cmp_compressonatorlib/buffer/codecbuffer_rgba16f.h index 7128b4e84..849d0bfa9 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba16f.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba16f.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RGBA16F_H_INCLUDED_ #define _CODECBUFFER_RGBA16F_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" #define CHANNEL_INDEX_R 0 #define CHANNEL_INDEX_G 1 diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba2101010.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rgba2101010.cpp index 85c180877..82ab3d0cd 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba2101010.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba2101010.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RGBA2101010.h" +#include "common.h" +#include "codecbuffer_rgba2101010.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba2101010.h b/cmp_compressonatorlib/buffer/codecbuffer_rgba2101010.h index f5adae3c0..455433bd2 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba2101010.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba2101010.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RGBA2101010_H_INCLUDED_ #define _CODECBUFFER_RGBA2101010_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_RGBA2101010 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba32.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rgba32.cpp index b2265e1a9..4353a3cb4 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba32.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba32.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RGBA32.h" +#include "common.h" +#include "codecbuffer_rgba32.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba32.h b/cmp_compressonatorlib/buffer/codecbuffer_rgba32.h index 26ae486ba..070be2c0e 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba32.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba32.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RGBA32_H_INCLUDED_ #define _CODECBUFFER_RGBA32_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_RGBA32 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba32f.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rgba32f.cpp index e85c8aa33..022c0b0b0 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba32f.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba32f.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RGBA32F.h" +#include "common.h" +#include "codecbuffer_rgba32f.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba32f.h b/cmp_compressonatorlib/buffer/codecbuffer_rgba32f.h index 863dd048c..6f38d2b44 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba32f.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba32f.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RGBA32F_H_INCLUDED_ #define _CODECBUFFER_RGBA32F_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" #define CHANNEL_INDEX_R 0 #define CHANNEL_INDEX_G 1 diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba8888.cpp b/cmp_compressonatorlib/buffer/codecbuffer_rgba8888.cpp index 2fd5026f8..a031908be 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba8888.cpp +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba8888.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "CodecBuffer_RGBA8888.h" +#include "common.h" +#include "codecbuffer_rgba8888.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/buffer/codecbuffer_rgba8888.h b/cmp_compressonatorlib/buffer/codecbuffer_rgba8888.h index 5d6039ed9..0d59521f8 100644 --- a/cmp_compressonatorlib/buffer/codecbuffer_rgba8888.h +++ b/cmp_compressonatorlib/buffer/codecbuffer_rgba8888.h @@ -29,7 +29,7 @@ #ifndef _CODECBUFFER_RGBA8888_H_INCLUDED_ #define _CODECBUFFER_RGBA8888_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" class CCodecBuffer_RGBA8888 : public CCodecBuffer { public: diff --git a/cmp_compressonatorlib/cmakelists.txt b/cmp_compressonatorlib/cmakelists.txt index 4bfd39af5..f3bb57086 100644 --- a/cmp_compressonatorlib/cmakelists.txt +++ b/cmp_compressonatorlib/cmakelists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.13) # add_library(CompressonatorLIB) # @@ -69,54 +70,52 @@ # Plugin_Half # ) -cmake_minimum_required(VERSION 3.13) - add_library(CompressonatorLIB STATIC "") file(GLOB_RECURSE CMP_SRCS "./*.h" "./*.cpp" - "ASTC/*.h" - "ASTC/*.cpp" - "ASTC/ARM/*.h" - "ASTC/ARM/*.cpp" - "ATC/*.h" - "ATC/*.cpp" - "ATI/*.h" - "ATI/*.cpp" - "ATI/*.c" - "BASIS/*.h" - "BASIS/*.cpp" - "BC6H/*.h" - "BC6H/*.cpp" - "BC7/*.h" - "BC7/*.cpp" - "Block/*.h" - "Block/*.cpp" - "Buffer/*.h" - "Buffer/*.cpp" - "DXT/*.h" - "DXT/*.cpp" - "DXTC/*.h" - "DXTC/*.cpp" - "DXTC/*.c" - "ETC/*.h" - "ETC/*.cpp" - "ETC/etcpack/*.h" - "ETC/etcpack/*.cpp" - "ETC/etcpack/*.cxx" - "GT/*.h" - "GT/*.cpp" - "APC/*.h" - "APC/*.cpp" - "Common/*.h" - "Common/*.cpp" - "../CMP_Framework/Common/*.h" - "../CMP_Framework/Common/*.cpp" - "../CMP_Framework/Common/half/*.h" - "../CMP_Framework/Common/half/*.cpp" - "../Applications/_Plugins/Common/ATIFormats.cpp" - "../Applications/_Plugins/Common/ATIFormats.h" + "astc/*.h" + "astc/*.cpp" + "astc/arm/*.h" + "astc/arm/*.cpp" + "atc/*.h" + "atc/*.cpp" + "ati/*.h" + "ati/*.cpp" + "ati/*.c" + "basis/*.h" + "basis/*.cpp" + "bc6h/*.h" + "bc6h/*.cpp" + "bc7/*.h" + "bc7/*.cpp" + "block/*.h" + "block/*.cpp" + "buffer/*.h" + "buffer/*.cpp" + "dxt/*.h" + "dxt/*.cpp" + "dxtc/*.h" + "dxtc/*.cpp" + "dxtc/*.c" + "etc/*.h" + "etc/*.cpp" + "etc/etcpack/*.h" + "etc/etcpack/*.cpp" + "etc/etcpack/*.cxx" + "gt/*.h" + "gt/*.cpp" + "apc/*.h" + "apc/*.cpp" + "common/*.h" + "common/*.cpp" + "../cmp_framework/common/*.h" + "../cmp_framework/common/*.cpp" + "../cmp_framework/common/half/*.h" + "../cmp_framework/common/half/*.cpp" + "../applications/_plugins/common/atiformats.cpp" + "../applications/_plugins/common/atiformats.h" ) target_sources(CompressonatorLIB @@ -127,23 +126,23 @@ target_sources(CompressonatorLIB target_include_directories(CompressonatorLIB PRIVATE ./ - ASTC - ASTC/ARM/ - ATC - ATI - BASIS - BC6H - BC7 - Block - Buffer - DXT - DXTC - ETC - ETC/etcpack/ - APC - GT - Common - ../CMP_Framework/Common - ../CMP_Framework/Common/half - ../Applications/_Plugins/Common) + astc + astc/arm/ + atc + ati + basis + bc6h + bc7 + block + buffer + dxt + dxtc + etc + etc/etcpack/ + apc + gt + common + ../cmp_framework/common + ../cmp_framework/common/half + ../applications/_plugins/common) diff --git a/cmp_compressonatorlib/common.h b/cmp_compressonatorlib/common.h index 176c8b92d..71aa87637 100644 --- a/cmp_compressonatorlib/common.h +++ b/cmp_compressonatorlib/common.h @@ -25,9 +25,9 @@ #define COMMON_H #ifndef NO_LEGACY_BEHAVIOR -#include "UseDefinitions.h" +#include "usedefinitions.h" #endif -#include "Compressonator.h" +#include "compressonator.h" #include #include diff --git a/cmp_compressonatorlib/common/codec.cpp b/cmp_compressonatorlib/common/codec.cpp index 1af9985b8..a1a3fd7c5 100644 --- a/cmp_compressonatorlib/common/codec.cpp +++ b/cmp_compressonatorlib/common/codec.cpp @@ -27,40 +27,40 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec.h" -#include "Codec_ATI1N.h" -#include "Codec_ATI2N.h" -#include "Codec_ATI2N_DXT5.h" -#include "Codec_DXT1.h" -#include "Codec_DXT3.h" -#include "Codec_DXT5.h" -#include "Codec_DXT5_xGBR.h" -#include "Codec_DXT5_RxBG.h" -#include "Codec_DXT5_RBxG.h" -#include "Codec_DXT5_xRBG.h" -#include "Codec_DXT5_RGxB.h" -#include "Codec_DXT5_xGxR.h" -#include "Codec_ATC_RGB.h" -#include "Codec_ATC_RGBA_Explicit.h" -#include "Codec_ATC_RGBA_Interpolated.h" -#include "Codec_ETC_RGB.h" -#include "Codec_ETC2_RGB.h" -#include "Codec_ETC2_RGBA.h" -#include "Codec_ETC2_RGBA1.h" -#include "Codec_BC6H.h" -#include "Codec_BC7.h" -#include "ASTC/Codec_ASTC.h" +#include "common.h" +#include "codec.h" +#include "codec_ati1n.h" +#include "codec_ati2n.h" +#include "codec_ati2n_dxt5.h" +#include "codec_dxt1.h" +#include "codec_dxt3.h" +#include "codec_dxt5.h" +#include "codec_dxt5_xgbr.h" +#include "codec_dxt5_rxbg.h" +#include "codec_dxt5_rbxg.h" +#include "codec_dxt5_xrbg.h" +#include "codec_dxt5_rgxb.h" +#include "codec_dxt5_xgxr.h" +#include "codec_atc_rgb.h" +#include "codec_atc_rgba_explicit.h" +#include "codec_atc_rgba_interpolated.h" +#include "codec_etc_rgb.h" +#include "codec_etc2_rgb.h" +#include "codec_etc2_rgba.h" +#include "codec_etc2_rgba1.h" +#include "codec_bc6h.h" +#include "codec_bc7.h" +#include "astc/codec_astc.h" #ifdef _WIN32 //GT only enabled for win build now #ifdef USE_APC -#include "Codec_APC.h" +#include "codec_apc.h" #endif #ifdef USE_GTC -#include "Codec_GT.h" +#include "codec_gt.h" #endif #ifdef USE_BASIS -#include "Codec_BASIS.h" +#include "codec_basis.h" #endif #endif diff --git a/cmp_compressonatorlib/common/codec.h b/cmp_compressonatorlib/common/codec.h index 97e60de74..a3cda3f8e 100644 --- a/cmp_compressonatorlib/common/codec.h +++ b/cmp_compressonatorlib/common/codec.h @@ -28,7 +28,7 @@ #ifndef _CODEC_H_INCLUDED_ #define _CODEC_H_INCLUDED_ -#include "CodecBuffer.h" +#include "codecbuffer.h" #define SAFE_DELETE(p) if(p){delete p;p=NULL;} diff --git a/cmp_compressonatorlib/common/compress.h b/cmp_compressonatorlib/common/compress.h index b500ad1a9..179ec9305 100644 --- a/cmp_compressonatorlib/common/compress.h +++ b/cmp_compressonatorlib/common/compress.h @@ -27,7 +27,7 @@ #ifndef COMPRESS_H #define COMPRESS_H -#include "Codec.h" +#include "codec.h" #include "float.h" #define FP_EXCEPTION_MASK _MCW_EM // Disable fp exceptions diff --git a/cmp_compressonatorlib/compress.cpp b/cmp_compressonatorlib/compress.cpp index bd4c99f91..27739e98b 100644 --- a/cmp_compressonatorlib/compress.cpp +++ b/cmp_compressonatorlib/compress.cpp @@ -28,9 +28,9 @@ // Code clean to support MSV 2010 and up ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Compressonator.h" -#include "Compress.h" +#include "common.h" +#include "compressonator.h" +#include "compress.h" #include #include diff --git a/cmp_compressonatorlib/compressonator.cpp b/cmp_compressonatorlib/compressonator.cpp index 3032ba39d..30a9a2aca 100644 --- a/cmp_compressonatorlib/compressonator.cpp +++ b/cmp_compressonatorlib/compressonator.cpp @@ -31,10 +31,10 @@ // Code clean to support MSV 2010 and up ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Compressonator.h" // User shared: Keep priviate code out of this header -#include "Compress.h" -#include "CMP_MIPS.h" +#include "common.h" +#include "compressonator.h" // User shared: Keep priviate code out of this header +#include "compress.h" +#include "cmp_mips.h" #include "debug.h" #include diff --git a/cmp_compressonatorlib/dxt/codec_dxt1.cpp b/cmp_compressonatorlib/dxt/codec_dxt1.cpp index 5d16b23d1..98da4ddcd 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt1.cpp +++ b/cmp_compressonatorlib/dxt/codec_dxt1.cpp @@ -28,12 +28,12 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Compressonator.h" -#include "Codec_DXT1.h" +#include "common.h" +#include "compressonator.h" +#include "codec_dxt1.h" #ifdef TEST_CMP_CORE_DECODER -#include "CMP_Core.h" +#include "cmp_core.h" #endif diff --git a/cmp_compressonatorlib/dxt/codec_dxt1.h b/cmp_compressonatorlib/dxt/codec_dxt1.h index 4cb4912ec..56357102e 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt1.h +++ b/cmp_compressonatorlib/dxt/codec_dxt1.h @@ -29,7 +29,7 @@ #ifndef _CODEC_DXT1_H_INCLUDED_ #define _CODEC_DXT1_H_INCLUDED_ -#include "Codec_DXTC.h" +#include "codec_dxtc.h" class CCodec_DXT1 : public CCodec_DXTC { public: diff --git a/cmp_compressonatorlib/dxt/codec_dxt3.cpp b/cmp_compressonatorlib/dxt/codec_dxt3.cpp index 373a3d664..8e1113b61 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt3.cpp +++ b/cmp_compressonatorlib/dxt/codec_dxt3.cpp @@ -28,11 +28,11 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_DXT3.h" +#include "common.h" +#include "codec_dxt3.h" #ifdef TEST_CMP_CORE_DECODER -#include "CMP_Core.h" +#include "cmp_core.h" #endif ////////////////////////////////////////////////////////////////////////////// diff --git a/cmp_compressonatorlib/dxt/codec_dxt3.h b/cmp_compressonatorlib/dxt/codec_dxt3.h index d68ec4613..33f7bf64b 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt3.h +++ b/cmp_compressonatorlib/dxt/codec_dxt3.h @@ -29,7 +29,7 @@ #ifndef _CODEC_DXT3_H_INCLUDED_ #define _CODEC_DXT3_H_INCLUDED_ -#include "Codec_DXTC.h" +#include "codec_dxtc.h" class CCodec_DXT3 : public CCodec_DXTC { public: diff --git a/cmp_compressonatorlib/dxt/codec_dxt5.cpp b/cmp_compressonatorlib/dxt/codec_dxt5.cpp index 3fb578c17..8adbcbc75 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5.cpp +++ b/cmp_compressonatorlib/dxt/codec_dxt5.cpp @@ -28,16 +28,16 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_DXT5.h" +#include "common.h" +#include "codec_dxt5.h" #ifdef TEST_CMP_CORE_DECODER -#include "CMP_Core.h" +#include "cmp_core.h" #endif #ifdef DXT5_COMPDEBUGGER #include "debug.h" -#include "CompClient.h" +#include "compclient.h" extern CompViewerClient g_CompClient; #endif diff --git a/cmp_compressonatorlib/dxt/codec_dxt5.h b/cmp_compressonatorlib/dxt/codec_dxt5.h index 9114ff194..6e1da3565 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5.h +++ b/cmp_compressonatorlib/dxt/codec_dxt5.h @@ -29,7 +29,7 @@ #ifndef _CODEC_DXT5_H_INCLUDED_ #define _CODEC_DXT5_H_INCLUDED_ -#include "Codec_DXTC.h" +#include "codec_dxtc.h" class CCodec_DXT5 : public CCodec_DXTC { public: diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_rbxg.cpp b/cmp_compressonatorlib/dxt/codec_dxt5_rbxg.cpp index de5a9cc59..0d9c2b834 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_rbxg.cpp +++ b/cmp_compressonatorlib/dxt/codec_dxt5_rbxg.cpp @@ -27,9 +27,9 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Compressonator.h" -#include "Codec_DXT5_RBxG.h" +#include "common.h" +#include "compressonator.h" +#include "codec_dxt5_rbxg.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_rbxg.h b/cmp_compressonatorlib/dxt/codec_dxt5_rbxg.h index 4786d5e09..2448d091c 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_rbxg.h +++ b/cmp_compressonatorlib/dxt/codec_dxt5_rbxg.h @@ -29,7 +29,7 @@ #ifndef _CODEC_DXT5_RBXG_H_INCLUDED_ #define _CODEC_DXT5_RBXG_H_INCLUDED_ -#include "Codec_DXT5_Swizzled.h" +#include "codec_dxt5_swizzled.h" class CCodec_DXT5_RBxG : public CCodec_DXT5_Swizzled { public: diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_rgxb.cpp b/cmp_compressonatorlib/dxt/codec_dxt5_rgxb.cpp index 805234fa0..c74e824a1 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_rgxb.cpp +++ b/cmp_compressonatorlib/dxt/codec_dxt5_rgxb.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_DXT5_RGxB.h" +#include "common.h" +#include "codec_dxt5_rgxb.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_rgxb.h b/cmp_compressonatorlib/dxt/codec_dxt5_rgxb.h index 567e14d26..f4f1533d1 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_rgxb.h +++ b/cmp_compressonatorlib/dxt/codec_dxt5_rgxb.h @@ -29,7 +29,7 @@ #ifndef _CODEC_DXT5_RGXB_H_INCLUDED_ #define _CODEC_DXT5_RGXB_H_INCLUDED_ -#include "Codec_DXT5_Swizzled.h" +#include "codec_dxt5_swizzled.h" class CCodec_DXT5_RGxB : public CCodec_DXT5_Swizzled { public: diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_rxbg.cpp b/cmp_compressonatorlib/dxt/codec_dxt5_rxbg.cpp index fb085f1b4..ff0699866 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_rxbg.cpp +++ b/cmp_compressonatorlib/dxt/codec_dxt5_rxbg.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_DXT5_RxBG.h" +#include "common.h" +#include "codec_dxt5_rxbg.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_rxbg.h b/cmp_compressonatorlib/dxt/codec_dxt5_rxbg.h index 7e8928108..4a359d4f8 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_rxbg.h +++ b/cmp_compressonatorlib/dxt/codec_dxt5_rxbg.h @@ -29,7 +29,7 @@ #ifndef _CODEC_DXT5_RXBG_H_INCLUDED_ #define _CODEC_DXT5_RXBG_H_INCLUDED_ -#include "Codec_DXT5_Swizzled.h" +#include "codec_dxt5_swizzled.h" class CCodec_DXT5_RxBG : public CCodec_DXT5_Swizzled { public: diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_swizzled.cpp b/cmp_compressonatorlib/dxt/codec_dxt5_swizzled.cpp index 9198faccc..3d746d73a 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_swizzled.cpp +++ b/cmp_compressonatorlib/dxt/codec_dxt5_swizzled.cpp @@ -28,8 +28,8 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_DXT5_Swizzled.h" +#include "common.h" +#include "codec_dxt5_swizzled.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_swizzled.h b/cmp_compressonatorlib/dxt/codec_dxt5_swizzled.h index 83e6cc2cd..70544c14a 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_swizzled.h +++ b/cmp_compressonatorlib/dxt/codec_dxt5_swizzled.h @@ -29,7 +29,7 @@ #ifndef _CODEC_DXT5_SWIZZLED_H_INCLUDED_ #define _CODEC_DXT5_SWIZZLED_H_INCLUDED_ -#include "Codec_DXTC.h" +#include "codec_dxtc.h" class CCodec_DXT5_Swizzled : public CCodec_DXTC { public: diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_xgbr.cpp b/cmp_compressonatorlib/dxt/codec_dxt5_xgbr.cpp index 93b4683ad..44050d437 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_xgbr.cpp +++ b/cmp_compressonatorlib/dxt/codec_dxt5_xgbr.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_DXT5_xGBR.h" +#include "common.h" +#include "codec_dxt5_xgbr.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_xgbr.h b/cmp_compressonatorlib/dxt/codec_dxt5_xgbr.h index 04e27f873..218595f9e 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_xgbr.h +++ b/cmp_compressonatorlib/dxt/codec_dxt5_xgbr.h @@ -30,7 +30,7 @@ #ifndef _CODEC_DXT5_XGBR_H_INCLUDED_ #define _CODEC_DXT5_XGBR_H_INCLUDED_ -#include "Codec_DXT5_Swizzled.h" +#include "codec_dxt5_swizzled.h" class CCodec_DXT5_xGBR : public CCodec_DXT5_Swizzled { public: diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_xgxr.cpp b/cmp_compressonatorlib/dxt/codec_dxt5_xgxr.cpp index 79a08575a..1251558cf 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_xgxr.cpp +++ b/cmp_compressonatorlib/dxt/codec_dxt5_xgxr.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_DXT5_xGxR.h" +#include "common.h" +#include "codec_dxt5_xgxr.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_xgxr.h b/cmp_compressonatorlib/dxt/codec_dxt5_xgxr.h index d06423571..409abb0e7 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_xgxr.h +++ b/cmp_compressonatorlib/dxt/codec_dxt5_xgxr.h @@ -29,7 +29,7 @@ #ifndef _CODEC_DXT5_XGXR_H_INCLUDED_ #define _CODEC_DXT5_XGXR_H_INCLUDED_ -#include "Codec_DXT5_Swizzled.h" +#include "codec_dxt5_swizzled.h" class CCodec_DXT5_xGxR : public CCodec_DXT5_Swizzled { public: diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_xrbg.cpp b/cmp_compressonatorlib/dxt/codec_dxt5_xrbg.cpp index 9958f1266..4f4598b71 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_xrbg.cpp +++ b/cmp_compressonatorlib/dxt/codec_dxt5_xrbg.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_DXT5_xRBG.h" +#include "common.h" +#include "codec_dxt5_xrbg.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/dxt/codec_dxt5_xrbg.h b/cmp_compressonatorlib/dxt/codec_dxt5_xrbg.h index d922c0fe9..f72728463 100644 --- a/cmp_compressonatorlib/dxt/codec_dxt5_xrbg.h +++ b/cmp_compressonatorlib/dxt/codec_dxt5_xrbg.h @@ -29,7 +29,7 @@ #ifndef _CODEC_DXT5_XRGB_H_INCLUDED_ #define _CODEC_DXT5_XRGB_H_INCLUDED_ -#include "Codec_DXT5_Swizzled.h" +#include "codec_dxt5_swizzled.h" class CCodec_DXT5_xRBG : public CCodec_DXT5_Swizzled { public: diff --git a/cmp_compressonatorlib/dxtc/codec_dxtc.cpp b/cmp_compressonatorlib/dxtc/codec_dxtc.cpp index c9a6e7d95..020a1b450 100644 --- a/cmp_compressonatorlib/dxtc/codec_dxtc.cpp +++ b/cmp_compressonatorlib/dxtc/codec_dxtc.cpp @@ -27,8 +27,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_DXTC.h" +#include "common.h" +#include "codec_dxtc.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/dxtc/codec_dxtc.h b/cmp_compressonatorlib/dxtc/codec_dxtc.h index 14ea923e3..9afb6220b 100644 --- a/cmp_compressonatorlib/dxtc/codec_dxtc.h +++ b/cmp_compressonatorlib/dxtc/codec_dxtc.h @@ -29,7 +29,7 @@ #ifndef _CODEC_DXTC_H_INCLUDED_ #define _CODEC_DXTC_H_INCLUDED_ -#include "Codec_Block_4x4.h" +#include "codec_block_4x4.h" #define DXTC_OFFSET_ALPHA 0 #define DXTC_OFFSET_RGB 2 diff --git a/cmp_compressonatorlib/dxtc/codec_dxtc_alpha.cpp b/cmp_compressonatorlib/dxtc/codec_dxtc_alpha.cpp index 21b690119..f65d7427e 100644 --- a/cmp_compressonatorlib/dxtc/codec_dxtc_alpha.cpp +++ b/cmp_compressonatorlib/dxtc/codec_dxtc_alpha.cpp @@ -27,9 +27,9 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_DXTC.h" -#include "CompressonatorXCodec.h" +#include "common.h" +#include "codec_dxtc.h" +#include "compressonatorxcodec.h" #include "dxtc_v11_compress.h" CodecError CCodec_DXTC::CompressAlphaBlock(CMP_BYTE alphaBlock[BLOCK_SIZE_4X4], CMP_DWORD compressedBlock[2]) { diff --git a/cmp_compressonatorlib/dxtc/codec_dxtc_rgba.cpp b/cmp_compressonatorlib/dxtc/codec_dxtc_rgba.cpp index 46338cd68..41498ca5c 100644 --- a/cmp_compressonatorlib/dxtc/codec_dxtc_rgba.cpp +++ b/cmp_compressonatorlib/dxtc/codec_dxtc_rgba.cpp @@ -27,9 +27,9 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_DXTC.h" -#include "CompressonatorXCodec.h" +#include "common.h" +#include "codec_dxtc.h" +#include "compressonatorxcodec.h" #include "dxtc_v11_compress.h" // #define PRINT_DECODE_INFO diff --git a/cmp_compressonatorlib/etc/codec_etc.cpp b/cmp_compressonatorlib/etc/codec_etc.cpp index 487207475..0fd7a32c3 100644 --- a/cmp_compressonatorlib/etc/codec_etc.cpp +++ b/cmp_compressonatorlib/etc/codec_etc.cpp @@ -27,10 +27,10 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "Common.h" -#include "Codec_ETC.h" -#include "Compressonator_tc.h" -#include "CompressonatorXCodec.h" +#include "common.h" +#include "codec_etc.h" +#include "compressonator_tc.h" +#include "compressonatorxcodec.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/etc/codec_etc.h b/cmp_compressonatorlib/etc/codec_etc.h index 5dd8ec3c1..c32abb635 100644 --- a/cmp_compressonatorlib/etc/codec_etc.h +++ b/cmp_compressonatorlib/etc/codec_etc.h @@ -29,8 +29,8 @@ #ifndef _Codec_ETC_H_INCLUDED_ #define _Codec_ETC_H_INCLUDED_ -#include "Common.h" -#include "Codec_Block_4x4.h" +#include "common.h" +#include "codec_block_4x4.h" #ifdef USE_ETCPACK #include "etcpack.h" diff --git a/cmp_compressonatorlib/etc/codec_etc2.cpp b/cmp_compressonatorlib/etc/codec_etc2.cpp index 5a18a9b1a..57d8d23dc 100644 --- a/cmp_compressonatorlib/etc/codec_etc2.cpp +++ b/cmp_compressonatorlib/etc/codec_etc2.cpp @@ -26,7 +26,7 @@ // Description: implementation of the CCodec_ETC2 class // -#include "Codec_ETC2.h" +#include "codec_etc2.h" #pragma warning( push ) #pragma warning(disable:4244) diff --git a/cmp_compressonatorlib/etc/codec_etc2.h b/cmp_compressonatorlib/etc/codec_etc2.h index 12c98c483..2e2f634f7 100644 --- a/cmp_compressonatorlib/etc/codec_etc2.h +++ b/cmp_compressonatorlib/etc/codec_etc2.h @@ -76,10 +76,10 @@ #ifndef _CODEC_ETC2_H_INCLUDED_ #define _CODEC_ETC2_H_INCLUDED_ -#include "Common.h" -#include "Codec_Block_4x4.h" -#include "Compressonator_tc.h" -#include "CompressonatorXCodec.h" +#include "common.h" +#include "codec_block_4x4.h" +#include "compressonator_tc.h" +#include "compressonatorxcodec.h" #define ATC_OFFSET_ALPHA 0 #define ATC_OFFSET_RGB 2 diff --git a/cmp_compressonatorlib/etc/codec_etc2_rgb.cpp b/cmp_compressonatorlib/etc/codec_etc2_rgb.cpp index abd2a71ed..a9d11b60c 100644 --- a/cmp_compressonatorlib/etc/codec_etc2_rgb.cpp +++ b/cmp_compressonatorlib/etc/codec_etc2_rgb.cpp @@ -28,12 +28,12 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_ETC2_RGB.h" -#include "Compressonator_tc.h" +#include "common.h" +#include "codec_etc2_rgb.h" +#include "compressonator_tc.h" #ifndef USE_ETCPACK -#include "Codec_ETC2_cmodel.cpp" +#include "codec_etc2_cmodel.cpp" #endif using namespace CMP; diff --git a/cmp_compressonatorlib/etc/codec_etc2_rgb.h b/cmp_compressonatorlib/etc/codec_etc2_rgb.h index 318400fe7..065d4f752 100644 --- a/cmp_compressonatorlib/etc/codec_etc2_rgb.h +++ b/cmp_compressonatorlib/etc/codec_etc2_rgb.h @@ -29,7 +29,7 @@ #ifndef _Codec_ETC2_RGB_H_INCLUDED_ #define _Codec_ETC2_RGB_H_INCLUDED_ -#include "Codec_ETC2.h" +#include "codec_etc2.h" class CCodec_ETC2_RGB : public CCodec_ETC2 { public: diff --git a/cmp_compressonatorlib/etc/codec_etc2_rgba.cpp b/cmp_compressonatorlib/etc/codec_etc2_rgba.cpp index 9093d602a..2fe46c2ed 100644 --- a/cmp_compressonatorlib/etc/codec_etc2_rgba.cpp +++ b/cmp_compressonatorlib/etc/codec_etc2_rgba.cpp @@ -28,8 +28,8 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_ETC2_RGBA.h" +#include "common.h" +#include "codec_etc2_rgba.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/etc/codec_etc2_rgba.h b/cmp_compressonatorlib/etc/codec_etc2_rgba.h index f0d265cbe..61c257738 100644 --- a/cmp_compressonatorlib/etc/codec_etc2_rgba.h +++ b/cmp_compressonatorlib/etc/codec_etc2_rgba.h @@ -29,7 +29,7 @@ #ifndef _CODEC_ETC2_RGBA_H_INCLUDED_ #define _CODEC_ETC2_RGBA_H_INCLUDED_ -#include "Codec_ETC2.h" +#include "codec_etc2.h" class CCodec_ETC2_RGBA: public CCodec_ETC2 { public: diff --git a/cmp_compressonatorlib/etc/codec_etc2_rgba1.cpp b/cmp_compressonatorlib/etc/codec_etc2_rgba1.cpp index 04a79b92e..c48541a97 100644 --- a/cmp_compressonatorlib/etc/codec_etc2_rgba1.cpp +++ b/cmp_compressonatorlib/etc/codec_etc2_rgba1.cpp @@ -28,9 +28,9 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_ETC2_RGBA1.h" -#include "Compressonator_tc.h" +#include "common.h" +#include "codec_etc2_rgba1.h" +#include "compressonator_tc.h" #include "etcpack_lib.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/cmp_compressonatorlib/etc/codec_etc2_rgba1.h b/cmp_compressonatorlib/etc/codec_etc2_rgba1.h index e2054fb73..badb5a16e 100644 --- a/cmp_compressonatorlib/etc/codec_etc2_rgba1.h +++ b/cmp_compressonatorlib/etc/codec_etc2_rgba1.h @@ -29,7 +29,7 @@ #ifndef _Codec_ETC2_RGBA1_H_INCLUDED_ #define _Codec_ETC2_RGBA1_H_INCLUDED_ -#include "Codec_ETC2.h" +#include "codec_etc2.h" class CCodec_ETC2_RGBA1 : public CCodec_ETC2 { public: diff --git a/cmp_compressonatorlib/etc/codec_etc_rgb.cpp b/cmp_compressonatorlib/etc/codec_etc_rgb.cpp index 56edc84fb..2b48ec67a 100644 --- a/cmp_compressonatorlib/etc/codec_etc_rgb.cpp +++ b/cmp_compressonatorlib/etc/codec_etc_rgb.cpp @@ -28,9 +28,9 @@ ////////////////////////////////////////////////////////////////////////////// #pragma warning(disable:4100) -#include "Common.h" -#include "Codec_ETC_RGB.h" -#include "Compressonator_tc.h" +#include "common.h" +#include "codec_etc_rgb.h" +#include "compressonator_tc.h" #include "etcpack_lib.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/cmp_compressonatorlib/etc/codec_etc_rgb.h b/cmp_compressonatorlib/etc/codec_etc_rgb.h index ac7beedc0..847df4196 100644 --- a/cmp_compressonatorlib/etc/codec_etc_rgb.h +++ b/cmp_compressonatorlib/etc/codec_etc_rgb.h @@ -29,7 +29,7 @@ #ifndef _Codec_ETC_RGB_H_INCLUDED_ #define _Codec_ETC_RGB_H_INCLUDED_ -#include "Codec_ETC.h" +#include "codec_etc.h" class CCodec_ETC_RGB : public CCodec_ETC { public: diff --git a/cmp_compressonatorlib/etc/codec_etc_rgba_explicit.cpp b/cmp_compressonatorlib/etc/codec_etc_rgba_explicit.cpp index 4bc55247f..c143eb246 100644 --- a/cmp_compressonatorlib/etc/codec_etc_rgba_explicit.cpp +++ b/cmp_compressonatorlib/etc/codec_etc_rgba_explicit.cpp @@ -22,12 +22,12 @@ // THE SOFTWARE. // -#include "Common.h" // napatel +#include "common.h" // napatel #ifdef SUPPORT_ETC_ALPHA #include "etcpack.h" -#include "Codec_ETC_RGBA_Explicit.h" +#include "codec_etc_rgba_explicit.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/etc/codec_etc_rgba_explicit.h b/cmp_compressonatorlib/etc/codec_etc_rgba_explicit.h index f7b1f4f25..c2b57d8a3 100644 --- a/cmp_compressonatorlib/etc/codec_etc_rgba_explicit.h +++ b/cmp_compressonatorlib/etc/codec_etc_rgba_explicit.h @@ -29,7 +29,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "Codec_ETC.h" +#include "codec_etc.h" class CCodec_ETC_RGBA_Explicit : public CCodec_ETC { public: diff --git a/cmp_compressonatorlib/etc/codec_etc_rgba_interpolated.cpp b/cmp_compressonatorlib/etc/codec_etc_rgba_interpolated.cpp index 612583e3a..910f78277 100644 --- a/cmp_compressonatorlib/etc/codec_etc_rgba_interpolated.cpp +++ b/cmp_compressonatorlib/etc/codec_etc_rgba_interpolated.cpp @@ -22,12 +22,12 @@ // THE SOFTWARE. // -#include "Common.h" // napatel +#include "common.h" // napatel #ifdef SUPPORT_ETC_ALPHA #include "etcpack.h" -#include "Codec_ETC_RGBA_Interpolated.h" +#include "codec_etc_rgba_interpolated.h" ////////////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/cmp_compressonatorlib/etc/codec_etc_rgba_interpolated.h b/cmp_compressonatorlib/etc/codec_etc_rgba_interpolated.h index dc4b1fcaa..c9e56a20f 100644 --- a/cmp_compressonatorlib/etc/codec_etc_rgba_interpolated.h +++ b/cmp_compressonatorlib/etc/codec_etc_rgba_interpolated.h @@ -29,7 +29,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "Codec_ETC.h" +#include "codec_etc.h" class CCodec_ETC_RGBA_Interpolated : public CCodec_ETC { public: diff --git a/cmp_compressonatorlib/gt/codec_gt.cpp b/cmp_compressonatorlib/gt/codec_gt.cpp index def26b74d..2fd14f5ed 100644 --- a/cmp_compressonatorlib/gt/codec_gt.cpp +++ b/cmp_compressonatorlib/gt/codec_gt.cpp @@ -29,13 +29,13 @@ #pragma warning(disable:4100) // Ignore warnings of unreferenced formal parameters #ifdef _WIN32 -#include "Common.h" -#include "Codec_GT.h" +#include "common.h" +#include "codec_gt.h" #include #include "debug.h" #ifdef GT_COMPDEBUGGER -#include "CompClient.h" +#include "compclient.h" #endif //====================================================================================== diff --git a/cmp_compressonatorlib/gt/codec_gt.h b/cmp_compressonatorlib/gt/codec_gt.h index b2c5fb594..6a7c846b8 100644 --- a/cmp_compressonatorlib/gt/codec_gt.h +++ b/cmp_compressonatorlib/gt/codec_gt.h @@ -28,10 +28,10 @@ #ifndef _CODEC_GTC_H_INCLUDED_ #define _CODEC_GTC_H_INCLUDED_ -#include "Compressonator.h" -#include "Codec_DXTC.h" -#include "GT_Encode.h" -#include "GT_Decode.h" +#include "compressonator.h" +#include "codec_dxtc.h" +#include "gt_encode.h" +#include "gt_decode.h" #include diff --git a/cmp_compressonatorlib/gt/gt_decode.cpp b/cmp_compressonatorlib/gt/gt_decode.cpp index 5bbc1179e..c5cb21fed 100644 --- a/cmp_compressonatorlib/gt/gt_decode.cpp +++ b/cmp_compressonatorlib/gt/gt_decode.cpp @@ -25,7 +25,7 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "GT_Decode.h" +#include "gt_decode.h" void (*GTC_DecompressBlock)( void *in, void *out) = NULL; diff --git a/cmp_compressonatorlib/gt/gt_decode.h b/cmp_compressonatorlib/gt/gt_decode.h index 3e2973231..f96eadec5 100644 --- a/cmp_compressonatorlib/gt/gt_decode.h +++ b/cmp_compressonatorlib/gt/gt_decode.h @@ -28,7 +28,7 @@ #ifndef _GT_DECODE_H_ #define _GT_DECODE_H_ -#include "GT_Definitions.h" +#include "gt_definitions.h" class GTCBlockDecoder { public: diff --git a/cmp_compressonatorlib/gt/gt_definitions.h b/cmp_compressonatorlib/gt/gt_definitions.h index ff6637cad..bc067b834 100644 --- a/cmp_compressonatorlib/gt/gt_definitions.h +++ b/cmp_compressonatorlib/gt/gt_definitions.h @@ -28,7 +28,7 @@ #ifndef _GTC_DEFINITIONS_H_ #define _GTC_DEFINITIONS_H_ -#include "Common.h" +#include "common.h" #define TRUE 1 #define FALSE 0 diff --git a/cmp_compressonatorlib/gt/gt_encode.cpp b/cmp_compressonatorlib/gt/gt_encode.cpp index 890b4b557..7f36f5db8 100644 --- a/cmp_compressonatorlib/gt/gt_encode.cpp +++ b/cmp_compressonatorlib/gt/gt_encode.cpp @@ -25,7 +25,7 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "GT_Encode.h" +#include "gt_encode.h" GTC_Encode g_GTCEncode; diff --git a/cmp_compressonatorlib/gt/gt_encode.h b/cmp_compressonatorlib/gt/gt_encode.h index 26aab3087..cb29a2084 100644 --- a/cmp_compressonatorlib/gt/gt_encode.h +++ b/cmp_compressonatorlib/gt/gt_encode.h @@ -29,7 +29,7 @@ #define _GT_ENCODE_H_ #include -#include "GT_Definitions.h" +#include "gt_definitions.h" class GTCBlockEncoder { public: diff --git a/cmp_core/cmakelists.txt b/cmp_core/cmakelists.txt index 537346cf0..8c6a6b619 100644 --- a/cmp_core/cmakelists.txt +++ b/cmp_core/cmakelists.txt @@ -2,25 +2,26 @@ add_library(CMP_Core) target_sources(CMP_Core PRIVATE - shaders/BC1_Encode_kernel.h - shaders/BC1_Encode_kernel.cpp - shaders/BC2_Encode_kernel.h - shaders/BC2_Encode_kernel.cpp - shaders/BC3_Encode_kernel.h - shaders/BC3_Encode_kernel.cpp - shaders/BC4_Encode_kernel.h - shaders/BC4_Encode_kernel.cpp - shaders/BC5_Encode_kernel.h - shaders/BC5_Encode_kernel.cpp - shaders/BC6_Encode_kernel.h - shaders/BC6_Encode_kernel.cpp - shaders/BC7_Encode_Kernel.h - shaders/BC7_Encode_Kernel.cpp - shaders/BCn_Common_Kernel.h - shaders/Common_Def.h + shaders/bc1_encode_kernel.h + shaders/bc1_encode_kernel.cpp + shaders/bc2_encode_kernel.h + shaders/bc2_encode_kernel.cpp + shaders/bc3_encode_kernel.h + shaders/bc3_encode_kernel.cpp + shaders/bc4_encode_kernel.h + shaders/bc4_encode_kernel.cpp + shaders/bc5_encode_kernel.h + shaders/bc5_encode_kernel.cpp + shaders/bc6_encode_kernel.h + shaders/bc6_encode_kernel.cpp + shaders/bc7_encode_kernel.h + shaders/bc7_encode_kernel.cpp + shaders/bcn_common_kernel.h + shaders/common_def.h - source/CMP_Core.h + source/cmp_core.h source/cmp_math_vec4.h + source/cmp_math_func.h ) target_include_directories(CMP_Core PUBLIC diff --git a/cmp_core/shaders/bc1_encode_kernel.cpp b/cmp_core/shaders/bc1_encode_kernel.cpp index 871668ee2..a7e028a79 100644 --- a/cmp_core/shaders/bc1_encode_kernel.cpp +++ b/cmp_core/shaders/bc1_encode_kernel.cpp @@ -32,10 +32,10 @@ //#define TEST_HEATMAP // Enable this to run heat map tests on BC1 codec #endif -#include "BC1_Encode_kernel.h" +#include "bc1_encode_kernel.h" #ifdef TEST_HEATMAP -#include "ExternCodec.h" // Use external codec for testing +#include "externcodec.h" // Use external codec for testing #endif //============================================== BC1 INTERFACES ======================================================= diff --git a/cmp_core/shaders/bc1_encode_kernel.h b/cmp_core/shaders/bc1_encode_kernel.h index 4e0af61a8..b7f942854 100644 --- a/cmp_core/shaders/bc1_encode_kernel.h +++ b/cmp_core/shaders/bc1_encode_kernel.h @@ -23,8 +23,8 @@ #ifndef BC1_ENCODE_KERNEL_H #define BC1_ENCODE_KERNEL_H -#include "Common_Def.h" -#include "BCn_Common_kernel.h" +#include "common_def.h" +#include "bcn_common_kernel.h" #endif \ No newline at end of file diff --git a/cmp_core/shaders/bc2_encode_kernel.cpp b/cmp_core/shaders/bc2_encode_kernel.cpp index 84888a7b9..bb4477379 100644 --- a/cmp_core/shaders/bc2_encode_kernel.cpp +++ b/cmp_core/shaders/bc2_encode_kernel.cpp @@ -21,7 +21,7 @@ // //===================================================================== -#include "BC2_Encode_kernel.h" +#include "bc2_encode_kernel.h" //============================================== BC2 INTERFACES ======================================================= diff --git a/cmp_core/shaders/bc2_encode_kernel.h b/cmp_core/shaders/bc2_encode_kernel.h index 9bab89798..0585264f1 100644 --- a/cmp_core/shaders/bc2_encode_kernel.h +++ b/cmp_core/shaders/bc2_encode_kernel.h @@ -23,8 +23,8 @@ #ifndef BC2_ENCODE_KERNEL_H #define BC2_ENCODE_KERNEL_H -#include "Common_Def.h" -#include "BCn_Common_kernel.h" +#include "common_def.h" +#include "bcn_common_kernel.h" #define BC2CompBlockSize 16 #define NUM_CHANNELS 4 diff --git a/cmp_core/shaders/bc3_encode_kernel.cpp b/cmp_core/shaders/bc3_encode_kernel.cpp index 329948b7a..641fedd03 100644 --- a/cmp_core/shaders/bc3_encode_kernel.cpp +++ b/cmp_core/shaders/bc3_encode_kernel.cpp @@ -20,7 +20,7 @@ // THE SOFTWARE. // //===================================================================== -#include "BC3_Encode_kernel.h" +#include "bc3_encode_kernel.h" //============================================== BC3 INTERFACES ======================================================= #ifndef ASPM_HLSL diff --git a/cmp_core/shaders/bc3_encode_kernel.h b/cmp_core/shaders/bc3_encode_kernel.h index 69721ce9f..c3bd78ac5 100644 --- a/cmp_core/shaders/bc3_encode_kernel.h +++ b/cmp_core/shaders/bc3_encode_kernel.h @@ -23,8 +23,8 @@ #ifndef BC3_ENCODE_KERNEL_H #define BC3_ENCODE_KERNEL_H -#include "Common_Def.h" -#include "BCn_Common_kernel.h" +#include "common_def.h" +#include "bcn_common_kernel.h" #define BC3CompBlockSize 16 diff --git a/cmp_core/shaders/bc4_encode_kernel.cpp b/cmp_core/shaders/bc4_encode_kernel.cpp index 03bd85278..7e7cbfda9 100644 --- a/cmp_core/shaders/bc4_encode_kernel.cpp +++ b/cmp_core/shaders/bc4_encode_kernel.cpp @@ -20,7 +20,7 @@ // THE SOFTWARE. // //===================================================================== -#include "BC4_Encode_kernel.h" +#include "bc4_encode_kernel.h" //============================================== BC4 INTERFACES ======================================================= diff --git a/cmp_core/shaders/bc4_encode_kernel.h b/cmp_core/shaders/bc4_encode_kernel.h index 6b77c7da3..e552c891f 100644 --- a/cmp_core/shaders/bc4_encode_kernel.h +++ b/cmp_core/shaders/bc4_encode_kernel.h @@ -23,8 +23,8 @@ #ifndef BC4_ENCODE_KERNEL_H #define BC4_ENCODE_KERNEL_H -#include "Common_Def.h" -#include "BCn_Common_kernel.h" +#include "common_def.h" +#include "bcn_common_kernel.h" #define BC4CompBlockSize 8 diff --git a/cmp_core/shaders/bc5_encode_kernel.cpp b/cmp_core/shaders/bc5_encode_kernel.cpp index 31dbf7782..8006e4271 100644 --- a/cmp_core/shaders/bc5_encode_kernel.cpp +++ b/cmp_core/shaders/bc5_encode_kernel.cpp @@ -20,7 +20,7 @@ // THE SOFTWARE. // //===================================================================== -#include "BC5_Encode_kernel.h" +#include "bc5_encode_kernel.h" //============================================== BC5 INTERFACES ======================================================= diff --git a/cmp_core/shaders/bc5_encode_kernel.h b/cmp_core/shaders/bc5_encode_kernel.h index 5864d0809..b1fbabeea 100644 --- a/cmp_core/shaders/bc5_encode_kernel.h +++ b/cmp_core/shaders/bc5_encode_kernel.h @@ -23,8 +23,8 @@ #ifndef BC5_ENCODE_KERNEL_H #define BC5_ENCODE_KERNEL_H -#include "Common_Def.h" -#include "BCn_Common_kernel.h" +#include "common_def.h" +#include "bcn_common_kernel.h" #define BC5CompBlockSize 16 diff --git a/cmp_core/shaders/bc6_encode_kernel.cpp b/cmp_core/shaders/bc6_encode_kernel.cpp index 608b636fd..7d4794e6c 100644 --- a/cmp_core/shaders/bc6_encode_kernel.cpp +++ b/cmp_core/shaders/bc6_encode_kernel.cpp @@ -20,7 +20,7 @@ // THE SOFTWARE. // //===================================================================== -#include "BC6_Encode_kernel.h" +#include "bc6_encode_kernel.h" #ifdef ASPM_GPU void memset(CGU_UINT8 *srcdata, CGU_UINT8 value, CGU_INT size) { diff --git a/cmp_core/shaders/bc6_encode_kernel.h b/cmp_core/shaders/bc6_encode_kernel.h index 7e0cc9c40..18c41ea80 100644 --- a/cmp_core/shaders/bc6_encode_kernel.h +++ b/cmp_core/shaders/bc6_encode_kernel.h @@ -25,7 +25,7 @@ #pragma warning(disable:4505) // disable warnings on unreferenced local function has been removed -#include "Common_Def.h" +#include "common_def.h" #define MAX_TRACE 10 #define MAX_ENTRIES_QUANT_TRACE 16 diff --git a/cmp_core/shaders/bc7_encode_kernel.cpp b/cmp_core/shaders/bc7_encode_kernel.cpp index 1d80d9896..6f53b81bf 100644 --- a/cmp_core/shaders/bc7_encode_kernel.cpp +++ b/cmp_core/shaders/bc7_encode_kernel.cpp @@ -40,7 +40,7 @@ //-------------------------------------- // Common BC7 Header //-------------------------------------- -#include "BC7_Encode_kernel.h" +#include "bc7_encode_kernel.h" #ifndef ASPM //--------------------------------------------- @@ -50,7 +50,7 @@ #ifndef ASPM_GPU // using code for CPU or hybrid (CPU/GPU) -//#include "BC7.h" +//#include "bc7.h" #endif diff --git a/cmp_core/shaders/bc7_encode_kernel.h b/cmp_core/shaders/bc7_encode_kernel.h index 894fe1f2b..4e9fffc12 100644 --- a/cmp_core/shaders/bc7_encode_kernel.h +++ b/cmp_core/shaders/bc7_encode_kernel.h @@ -25,12 +25,7 @@ #pragma warning(disable:4505) // disable warnings on unreferenced local function has been removed -#if defined(ISPC)||defined(ASPM) -//#include "..\..\Common\Common_Def.h" -#include "Common_Def.h" -#else -#include "Common_Def.h" -#endif +#include "common_def.h" // cmp param uniform data tracking typedef CGU_UINT8 CGU_CHANNEL; diff --git a/cmp_core/shaders/bcn_common_kernel.h b/cmp_core/shaders/bcn_common_kernel.h index a4d8e7d16..bd8daa7f7 100644 --- a/cmp_core/shaders/bcn_common_kernel.h +++ b/cmp_core/shaders/bcn_common_kernel.h @@ -31,7 +31,7 @@ #pragma warning(disable : 4505) // disable warnings on unreferenced local function has been removed -#include "Common_Def.h" +#include "common_def.h" //----------------------------------------------------------------------- // When build is for CPU, we have some missing API calls common to GPU diff --git a/cmp_core/source/cmp_math_func.h b/cmp_core/source/cmp_math_func.h index 681819d0f..52c383a32 100644 --- a/cmp_core/source/cmp_math_func.h +++ b/cmp_core/source/cmp_math_func.h @@ -24,7 +24,7 @@ #define CMP_MATH_FUNC_H -#include "Common_Def.h" +#include "common_def.h" #include diff --git a/cmp_core/test/cmakelists.txt b/cmp_core/test/cmakelists.txt index 365a4bed2..ae6ddb570 100644 --- a/cmp_core/test/cmakelists.txt +++ b/cmp_core/test/cmakelists.txt @@ -3,14 +3,14 @@ add_executable(CMP_Core_Tests_BIN) target_sources(CMP_Core_Tests_BIN PRIVATE - BlockConstants.h - CompressonatorTests.cpp - CompressonatorTests.h - TestsMain.cpp + blockconstants.h + compressonatortests.cpp + compressonatortests.h + testsmain.cpp ) target_include_directories(CMP_Core_Tests_BIN PUBLIC - ${PROJECT_SOURCE_DIR}/../common/lib/ext/Catch2 + ${PROJECT_SOURCE_DIR}/../common/lib/ext/catch2 ) target_link_libraries(CMP_Core_Tests_BIN diff --git a/cmp_core/test/compressonatortests.cpp b/cmp_core/test/compressonatortests.cpp index e0e1b6a04..8a80751cd 100644 --- a/cmp_core/test/compressonatortests.cpp +++ b/cmp_core/test/compressonatortests.cpp @@ -21,13 +21,13 @@ // //===================================================================== -#include "CompressonatorTests.h" +#include "compressonatortests.h" // incudes all compressed 4x4 blocks -#include "BlockConstants.h" +#include "blockconstants.h" -#include -#include +#include +#include #include "single_include/catch2/catch.hpp" diff --git a/cmp_core/test/testsmain.cpp b/cmp_core/test/testsmain.cpp index 711213df8..efa432ab2 100644 --- a/cmp_core/test/testsmain.cpp +++ b/cmp_core/test/testsmain.cpp @@ -23,7 +23,7 @@ #define CATCH_CONFIG_RUNNER #include "single_include/catch2/catch.hpp" -#include "CompressonatorTests.h" +#include "compressonatortests.h" int main(int argc, char* argv[]) { AssignExpectedColorsToBlocks(); diff --git a/cmp_framework/cmakelists.txt b/cmp_framework/cmakelists.txt index e0bb2ffbf..c02ba5839 100644 --- a/cmp_framework/cmakelists.txt +++ b/cmp_framework/cmakelists.txt @@ -2,7 +2,7 @@ add_library(CMP_FrameworkLIB INTERFACE) target_sources(CMP_FrameworkLIB INTERFACE - CMP_Framework.h + cmp_framework.h ) target_include_directories(CMP_FrameworkLIB @@ -38,87 +38,87 @@ INTERFACE add_library(CMP_Framework STATIC "") file(GLOB_RECURSE half - "Common/half/*.h" - "Common/half/*.cpp" + "common/half/*.h" + "common/half/*.cpp" ) file(GLOB_RECURSE DDS - "../Applications/_Plugins/CImage/DDS/*h" - "../Applications/_Plugins/CImage/DDS/*.cpp" + "../applications/_plugins/cimage/dds/*h" + "../applications/_plugins/cimage/dds/*.cpp" ) file(GLOB_RECURSE HPC - "../Applications/_Plugins/CCMP_Encode/HPC/*h" - "../Applications/_Plugins/CCMP_Encode/HPC/*.cpp" + "../applications/_plugins/ccmp_encode/hpc/*h" + "../applications/_plugins/ccmp_encode/hpc/*.cpp" ) target_sources(CMP_Framework PRIVATE - ../CMP_Core/shaders/BC1_Encode_kernel.h - ../CMP_Core/shaders/BC1_Encode_kernel.cpp - ../CMP_Core/shaders/BC2_Encode_kernel.h - ../CMP_Core/shaders/BC2_Encode_kernel.cpp - ../CMP_Core/shaders/BC3_Encode_kernel.h - ../CMP_Core/shaders/BC3_Encode_kernel.cpp - ../CMP_Core/shaders/BC4_Encode_kernel.h - ../CMP_Core/shaders/BC4_Encode_kernel.cpp - ../CMP_Core/shaders/BC5_Encode_kernel.h - ../CMP_Core/shaders/BC5_Encode_kernel.cpp - ../CMP_Core/shaders/BC6_Encode_kernel.h - ../CMP_Core/shaders/BC6_Encode_kernel.cpp - ../CMP_Core/shaders/BC7_Encode_Kernel.h - ../CMP_Core/shaders/BC7_Encode_Kernel.cpp - ../CMP_Core/shaders/BCn_Common_Kernel.h - ../CMP_Core/source/CMP_Core.h - ../Applications/_Libs/CMP_Math/cmp_math_common.h - ../Applications/_Libs/CMP_Math/cmp_math_common.cpp - ../Applications/_Libs/CMP_Math/cmp_math_cpuid.h - ../Applications/_Libs/CMP_Math/cmp_math_cpuid.cpp - ../Applications/_Plugins/Common/ATIFormats.cpp - ../Applications/_Plugins/Common/ATIFormats.h - ../Applications/_Plugins/Common/PluginBase.h - ../Applications/_Plugins/Common/PluginInterface.h - ../Applications/_Plugins/Common/PluginManager.h - ../Applications/_Plugins/Common/PluginManager.cpp - ../Applications/_Plugins/Common/query_timer.h - ../Applications/_Plugins/Common/query_timer.cpp - ../Applications/_Plugins/Common/stb_image.h - ../Applications/_Plugins/Common/TC_PluginAPI.h - ../Applications/_Plugins/Common/TC_PluginInternal.h - ../Applications/_Plugins/Common/TC_PluginInternal.cpp - ../Applications/_Plugins/Common/UtilFuncs.h - ../Applications/_Plugins/Common/UtilFuncs.cpp - ../Applications/_Plugins/CCMP_SDK/BC1/BC1.h - ../Applications/_Plugins/CCMP_SDK/BC1/BC1.cpp - ../Applications/_Plugins/CCMP_SDK/BC2/BC2.h - ../Applications/_Plugins/CCMP_SDK/BC2/BC2.cpp - ../Applications/_Plugins/CCMP_SDK/BC3/BC3.h - ../Applications/_Plugins/CCMP_SDK/BC3/BC3.cpp - ../Applications/_Plugins/CCMP_SDK/BC4/BC4.h - ../Applications/_Plugins/CCMP_SDK/BC4/BC4.cpp - ../Applications/_Plugins/CCMP_SDK/BC5/BC5.h - ../Applications/_Plugins/CCMP_SDK/BC5/BC5.cpp - ../Applications/_Plugins/CCMP_SDK/BC6/BC6H.h - ../Applications/_Plugins/CCMP_SDK/BC6/BC6H.cpp - ../Applications/_Plugins/CCMP_SDK/BC7/BC7.h - ../Applications/_Plugins/CCMP_SDK/BC7/BC7.cpp - Common/CMP_BoxFilter.cpp - Common/CMP_BoxFilter.h - Common/CMP_MIPS.cpp - Common/CMP_MIPS.h - Compute_Base.cpp - Compute_Base.h + ../cmp_core/shaders/bc1_encode_kernel.h + ../cmp_core/shaders/bc1_encode_kernel.cpp + ../cmp_core/shaders/bc2_encode_kernel.h + ../cmp_core/shaders/bc2_encode_kernel.cpp + ../cmp_core/shaders/bc3_encode_kernel.h + ../cmp_core/shaders/bc3_encode_kernel.cpp + ../cmp_core/shaders/bc4_encode_kernel.h + ../cmp_core/shaders/bc4_encode_kernel.cpp + ../cmp_core/shaders/bc5_encode_kernel.h + ../cmp_core/shaders/bc5_encode_kernel.cpp + ../cmp_core/shaders/bc6_encode_kernel.h + ../cmp_core/shaders/bc6_encode_kernel.cpp + ../cmp_core/shaders/bc7_encode_kernel.h + ../cmp_core/shaders/bc7_encode_kernel.cpp + ../cmp_core/shaders/bcn_common_kernel.h + ../cmp_core/source/cmp_core.h + ../applications/_libs/cmp_math/cmp_math_common.h + ../applications/_libs/cmp_math/cmp_math_common.cpp + ../applications/_libs/cmp_math/cmp_math_cpuid.h + ../applications/_libs/cmp_math/cmp_math_cpuid.cpp + ../applications/_plugins/common/atiformats.cpp + ../applications/_plugins/common/atiformats.h + ../applications/_plugins/common/pluginbase.h + ../applications/_plugins/common/plugininterface.h + ../applications/_plugins/common/pluginmanager.h + ../applications/_plugins/common/pluginmanager.cpp + ../applications/_plugins/common/query_timer.h + ../applications/_plugins/common/query_timer.cpp + ../applications/_plugins/common/stb_image.h + ../applications/_plugins/common/tc_pluginapi.h + ../applications/_plugins/common/tc_plugininternal.h + ../applications/_plugins/common/tc_plugininternal.cpp + ../applications/_plugins/common/utilfuncs.h + ../applications/_plugins/common/utilfuncs.cpp + ../applications/_plugins/ccmp_sdk/bc1/bc1.h + ../applications/_plugins/ccmp_sdk/bc1/bc1.cpp + ../applications/_plugins/ccmp_sdk/bc2/bc2.h + ../applications/_plugins/ccmp_sdk/bc2/bc2.cpp + ../applications/_plugins/ccmp_sdk/bc3/bc3.h + ../applications/_plugins/ccmp_sdk/bc3/bc3.cpp + ../applications/_plugins/ccmp_sdk/bc4/bc4.h + ../applications/_plugins/ccmp_sdk/bc4/bc4.cpp + ../applications/_plugins/ccmp_sdk/bc5/bc5.h + ../applications/_plugins/ccmp_sdk/bc5/bc5.cpp + ../applications/_plugins/ccmp_sdk/bc6/bc6h.h + ../applications/_plugins/ccmp_sdk/bc6/bc6h.cpp + ../applications/_plugins/ccmp_sdk/bc7/bc7.h + ../applications/_plugins/ccmp_sdk/bc7/bc7.cpp + common/cmp_boxfilter.cpp + common/cmp_boxfilter.h + common/cmp_mips.cpp + common/cmp_mips.h + compute_base.cpp + compute_base.h ${half} ${DDS} ${HPC} ) target_include_directories(CMP_Framework PRIVATE - ../CMP_Core/source - ../CMP_Core/shaders - ../CMP_CompressonatorLib - Common/half/ - ../Applications/_Plugins/Common/ - ../Applications/_Libs/CMP_Math/ - ../Applications/_Libs/GPU_Decode + ../cmp_core/source + ../cmp_core/shaders + ../cmp_compressonatorlib + common/half/ + ../applications/_plugins/common/ + ../applications/_libs/cmp_math/ + ../applications/_libs/gpu_decode ./ ) if (UNIX) diff --git a/cmp_framework/common/cmp_boxfilter.cpp b/cmp_framework/common/cmp_boxfilter.cpp index 5209690c0..0a8e19722 100644 --- a/cmp_framework/common/cmp_boxfilter.cpp +++ b/cmp_framework/common/cmp_boxfilter.cpp @@ -23,8 +23,8 @@ // #include -#include "CMP_MIPS.h" -#include "CMP_BoxFilter.h" +#include "cmp_mips.h" +#include "cmp_boxfilter.h" template void CMP_GenerateMipLevelF(CMP_MipLevel* pCurMipLevel, CMP_MipLevel* pPrevMipLevelOne, CMP_MipLevel* pPrevMipLevelTwo, T* curMipData, T* prevMip1Data, T* prevMip2Data) { diff --git a/cmp_framework/common/cmp_boxfilter.h b/cmp_framework/common/cmp_boxfilter.h index 76c6cd318..773ec77f7 100644 --- a/cmp_framework/common/cmp_boxfilter.h +++ b/cmp_framework/common/cmp_boxfilter.h @@ -25,7 +25,7 @@ #ifndef _CMP_BOX_FILTER_H #define _CMP_BOX_FILTER_H -#include +#include template void CMP_GenerateMipLevelF(CMP_MipLevel* pCurMipLevel, CMP_MipLevel* pPrevMipLevelOne, CMP_MipLevel* pPrevMipLevelTwo = NULL, T* curMipData = NULL, T* prevMip1Data = NULL, T* prevMip2Data = NULL); diff --git a/cmp_framework/common/cmp_mips.cpp b/cmp_framework/common/cmp_mips.cpp index 6062468bb..2302b2a7f 100644 --- a/cmp_framework/common/cmp_mips.cpp +++ b/cmp_framework/common/cmp_mips.cpp @@ -22,9 +22,9 @@ // THE SOFTWARE. // -#include "Compressonator.h" +#include "compressonator.h" -#include "CMP_MIPS.h" +#include "cmp_mips.h" #include #include @@ -208,11 +208,12 @@ CMP_ERROR CMP_API CMP_CalcMipSetMSE_PSNR(CMP_MipSet* src1, CMP_MipSet* src2, CMP if (!pCurMipLevel2) return CMP_ERR_INVALID_SOURCE_TEXTURE; - if (src1->m_ChannelFormat == CF_8bit) + // processed only if both codecs have the same channel formats + if ((src1->m_ChannelFormat == CF_8bit) && (src2->m_ChannelFormat == CF_8bit)) CMP_calcMSE_PSNRb(pCurMipLevel1, pCurMipLevel1->m_pbData, pCurMipLevel2->m_pbData, outMSE, outPSNR, 4); - else if (src1->m_ChannelFormat == CF_Float16) + else if ((src1->m_ChannelFormat == CF_Float16) && (src2->m_ChannelFormat == CF_Float16)) CMP_calcMSE_PSNRf(pCurMipLevel1, pCurMipLevel1->m_phfsData, pCurMipLevel2->m_phfsData, outMSE, outPSNR, 4); - else if (src1->m_ChannelFormat == CF_Float32) + else if ((src1->m_ChannelFormat == CF_Float32) &&(src1->m_ChannelFormat == CF_Float32)) CMP_calcMSE_PSNRf(pCurMipLevel1, pCurMipLevel1->m_pfData, pCurMipLevel2->m_pfData, outMSE, outPSNR, 4); return CMP_OK; } diff --git a/cmp_framework/common/cmp_mips.h b/cmp_framework/common/cmp_mips.h index afec356df..9caa29cf1 100644 --- a/cmp_framework/common/cmp_mips.h +++ b/cmp_framework/common/cmp_mips.h @@ -25,8 +25,8 @@ #ifndef _CMP_MIPS_H #define _CMP_MIPS_H -#include "Common.h" -#include "Compressonator.h" +#include "common.h" +#include "compressonator.h" #include "stdlib.h" #ifndef CMP_MAX diff --git a/cmp_framework/common/half/half.cpp b/cmp_framework/common/half/half.cpp index a3596d85f..30e9f4984 100644 --- a/cmp_framework/common/half/half.cpp +++ b/cmp_framework/common/half/half.cpp @@ -57,9 +57,9 @@ using namespace std; //------------------------------------------------------------- HALF_EXPORT const half::uif half::_toFloat[1 << 16] = -#include "toFloat.h" +#include "tofloat.h" HALF_EXPORT const unsigned short half::_eLut[1 << 9] = -#include "eLut.h" +#include "elut.h" //----------------------------------------------- // Overflow handler for float-to-half conversion; diff --git a/cmp_framework/common/half/half.h b/cmp_framework/common/half/half.h index 94807490d..f1e9fc314 100644 --- a/cmp_framework/common/half/half.h +++ b/cmp_framework/common/half/half.h @@ -85,7 +85,7 @@ #ifndef _HALF_H_ #define _HALF_H_ -#include "halfExport.h" // for definition of HALF_EXPORT +#include "halfexport.h" // for definition of HALF_EXPORT #include class half { diff --git a/cmp_framework/common/half/halffunction.h b/cmp_framework/common/half/halffunction.h index fd1c4b4cc..75cfd75f6 100644 --- a/cmp_framework/common/half/halffunction.h +++ b/cmp_framework/common/half/halffunction.h @@ -85,7 +85,7 @@ #include "half.h" -#include "IlmBaseConfig.h" +#include "ilmbaseconfig.h" #ifndef ILMBASE_HAVE_LARGE_STACK #include // need this for memset #else diff --git a/cmp_framework/common/hdr_encode.cpp b/cmp_framework/common/hdr_encode.cpp index 49f710cff..5663312b7 100644 --- a/cmp_framework/common/hdr_encode.cpp +++ b/cmp_framework/common/hdr_encode.cpp @@ -28,7 +28,7 @@ ////////////////////////////////////////////////////////////////////////////// -#include "HDR_Encode.h" +#include "hdr_encode.h" #include #include #include diff --git a/cmp_framework/compute_base.cpp b/cmp_framework/compute_base.cpp index 33da03e80..bf5c5b2ae 100644 --- a/cmp_framework/compute_base.cpp +++ b/cmp_framework/compute_base.cpp @@ -24,10 +24,10 @@ //===================================================================== #include -#include "Compute_Base.h" -#include "PluginInterface.h" -#include "Texture.h" -#include "CMP_Core.h" +#include "compute_base.h" +#include "plugininterface.h" +#include "texture.h" +#include "cmp_core.h" #ifndef _WIN32 #include /* For open(), creat() */ @@ -38,7 +38,7 @@ #include -const CMP_CHAR* GetFormatDesc(CMP_FORMAT nFormat); +CMP_CHAR* GetFormatDesc(CMP_FORMAT nFormat); PluginManager g_pluginManager; PluginInterface_Encoder* plugin_encoder_codec = NULL; static CMP_BOOL HostPluginsRegistered = FALSE; @@ -138,6 +138,7 @@ const CMP_CHAR* GetEncodeWithDesc(CMP_Compute_type nFormat) { return "CPU"; } +#ifdef _WIN32 bool cmp_recompile_shader(std::string m_sourceShaderFile) { bool rebuild = false; FILE* p_file_bin = NULL; @@ -153,6 +154,7 @@ bool cmp_recompile_shader(std::string m_sourceShaderFile) { if (attr != attrib.st_ctime) { char buff[128]; sprintf_s(buff, " %llx ", attrib.st_ctime); + // snprintf(buff, 128, " %llx ", attrib.st_ctime); fseek(p_file_bin, 2, SEEK_SET); fwrite(buff, 1, 9, p_file_bin); rebuild = true; @@ -162,7 +164,7 @@ bool cmp_recompile_shader(std::string m_sourceShaderFile) { } return rebuild; } - +#endif //------------------------- // Application is "Exiting" @@ -200,6 +202,11 @@ bool isDX12Supported() { return true; } +#else +bool isDX12Supported() +{ + return false; +} #endif // diff --git a/cmp_framework/compute_base.h b/cmp_framework/compute_base.h index 3a341c7a5..9b0f68af8 100644 --- a/cmp_framework/compute_base.h +++ b/cmp_framework/compute_base.h @@ -26,10 +26,10 @@ #ifndef COMPUTE_BASE_H #define COMPUTE_BASE_H -#include "Compressonator.h" -#include "Common.h" -#include "Common_KernelDef.h" -#include "Texture.h" +#include "compressonator.h" +#include "common.h" +#include "common_kerneldef.h" +#include "texture.h" namespace CMP_Compute_Base { diff --git a/docs/source/gui_tool/getting_started/index.rst b/docs/source/gui_tool/getting_started/index.rst index 807e3102c..b7300b828 100644 --- a/docs/source/gui_tool/getting_started/index.rst +++ b/docs/source/gui_tool/getting_started/index.rst @@ -5,4 +5,4 @@ GUI Getting Started :maxdepth: 1 :name: toc-GUI_Getting_Started - GettingStarted + gettingstarted diff --git a/docs/source/gui_tool/user_guide/index.rst b/docs/source/gui_tool/user_guide/index.rst index 56697c7fa..dbb235671 100644 --- a/docs/source/gui_tool/user_guide/index.rst +++ b/docs/source/gui_tool/user_guide/index.rst @@ -5,9 +5,9 @@ GUI User Guide :maxdepth: 4 :name: toc-GUI_User_Guide - index_Introduction - index_TheMainWindow - index_TextureCompression - index_3DModelCompression - UserGuide + index_introduction + index_themainwindow + index_texturecompression + index_3dmodelcompression + userguide diff --git a/docs/source/gui_tool/user_guide/index_3dmodelcompression.rst b/docs/source/gui_tool/user_guide/index_3dmodelcompression.rst index 84f82faeb..0741b7c2c 100644 --- a/docs/source/gui_tool/user_guide/index_3dmodelcompression.rst +++ b/docs/source/gui_tool/user_guide/index_3dmodelcompression.rst @@ -5,5 +5,5 @@ :maxdepth: 4 :name: toc-GUI_3DModelCompression - 3DModelCompression + 3dmodelcompression diff --git a/docs/source/gui_tool/user_guide/index_introduction.rst b/docs/source/gui_tool/user_guide/index_introduction.rst index fc345e3a4..8c717ecfc 100644 --- a/docs/source/gui_tool/user_guide/index_introduction.rst +++ b/docs/source/gui_tool/user_guide/index_introduction.rst @@ -5,7 +5,7 @@ Introduction :maxdepth: 4 :name: toc-GUI_Introduction - Introduction + introduction This guide provides detailed information on the Compressonator GUI diff --git a/docs/source/gui_tool/user_guide/index_texturecompression.rst b/docs/source/gui_tool/user_guide/index_texturecompression.rst index bcad1e674..5c1487854 100644 --- a/docs/source/gui_tool/user_guide/index_texturecompression.rst +++ b/docs/source/gui_tool/user_guide/index_texturecompression.rst @@ -5,5 +5,5 @@ Texture Compression :maxdepth: 4 :name: toc-GUI_TextureCompression - TextureCompression + texturecompression diff --git a/docs/source/gui_tool/user_guide/index_themainwindow.rst b/docs/source/gui_tool/user_guide/index_themainwindow.rst index 4232173d8..f1bc6fa8c 100644 --- a/docs/source/gui_tool/user_guide/index_themainwindow.rst +++ b/docs/source/gui_tool/user_guide/index_themainwindow.rst @@ -5,12 +5,12 @@ The Main Window :maxdepth: 4 :name: toc-GUI_TheMainWindow - ImageView - Toolbars - ApplicationOptions - PropertyView - ProjectExplorer - MessageOutput + imageview + toolbars + applicationoptions + propertyview + projectexplorer + messageoutput |image9| diff --git a/examples/common/cmakelists.txt b/examples/common/cmakelists.txt index 812b7c9da..02450ff04 100644 --- a/examples/common/cmakelists.txt +++ b/examples/common/cmakelists.txt @@ -2,15 +2,15 @@ add_library(dds_helper STATIC) target_sources(dds_helper PRIVATE - DDS_Helpers.cpp - DDS_Helpers.h + dds_helpers.cpp + dds_helpers.h ) target_include_directories(dds_helper PUBLIC ./ - ${PROJECT_SOURCE_DIR}/CMP_CompressonatorLib/ # Source based path - ${PROJECT_SOURCE_DIR}/Examples/common/ # Source based path - ${COMPRESSONATOR_ROOT}/SDK/include/ # Installer based path + ${PROJECT_SOURCE_DIR}/cmp_compressonatorlib/ # source based path + ${PROJECT_SOURCE_DIR}/examples/common/ # source based path + ${COMPRESSONATOR_ROOT}/sdk/include/ # installer based path ) target_link_libraries(dds_helper diff --git a/examples/common/dds_helpers.cpp b/examples/common/dds_helpers.cpp index 1e67cc462..a8f0cf49c 100644 --- a/examples/common/dds_helpers.cpp +++ b/examples/common/dds_helpers.cpp @@ -24,8 +24,8 @@ #pragma warning(disable:4996) // Ignoring 'fopen': This function or variable may be unsafe -#include "Compressonator.h" -#include "DDS_Helpers.h" +#include "compressonator.h" +#include "dds_helpers.h" #include #include #include diff --git a/examples/common/dds_helpers.h b/examples/common/dds_helpers.h index 204c0378d..e23ce167e 100644 --- a/examples/common/dds_helpers.h +++ b/examples/common/dds_helpers.h @@ -22,14 +22,14 @@ // AMD_Compress_Test_Helpers.h : Defines the entry point for the console application. // -#include "Compressonator.h" +#include "compressonator.h" CMP_FORMAT GetFormat(CMP_DWORD dwFourCC); CMP_DWORD GetFourCC(CMP_FORMAT nFormat); bool IsDXT5SwizzledFormat(CMP_FORMAT nFormat); CMP_FORMAT ParseFormat(const char* pszFormat); -const char* GetFormatDesc(CMP_FORMAT nFormat); +char* GetFormatDesc(CMP_FORMAT nFormat); bool LoadDDSFile(const char* pszFile, CMP_Texture& texture); void SaveDDSFile(const char* pszFile, CMP_Texture& texture); diff --git a/examples/core_example1/cmakelists.txt b/examples/core_example1/cmakelists.txt index 0b60981b3..c34fc91ff 100644 --- a/examples/core_example1/cmakelists.txt +++ b/examples/core_example1/cmakelists.txt @@ -2,7 +2,7 @@ add_executable(core_example1) target_sources(core_example1 PRIVATE - CoreExample.cpp + coreexample.cpp ) target_link_libraries(core_example1 diff --git a/examples/core_example1/coreexample.cpp b/examples/core_example1/coreexample.cpp index 0a6492627..8648e2286 100644 --- a/examples/core_example1/coreexample.cpp +++ b/examples/core_example1/coreexample.cpp @@ -30,7 +30,7 @@ #include #include -#include "CMP_Core.h" +#include "cmp_core.h" //------------------------------------------------------------------------------------------------ // Sample 4x4 shapes first sample is a shape0 pattern (1's and 0's) used for BC6 and BC7 encoding. diff --git a/examples/framework_example1/cmakelists.txt b/examples/framework_example1/cmakelists.txt index 484eee0b4..abd7b77ca 100644 --- a/examples/framework_example1/cmakelists.txt +++ b/examples/framework_example1/cmakelists.txt @@ -6,13 +6,13 @@ add_executable(framework_example1) target_sources(framework_example1 PRIVATE - Framework_Example1.cpp + framework_example1.cpp ) target_include_directories(framework_example1 PUBLIC ./ - ${PROJECT_SOURCE_DIR}/CMP_Framework/ # Source based path - ${COMPRESSONATOR_ROOT}/SDK/include/ # Installer based path + ${PROJECT_SOURCE_DIR}/cmp_framework/ # Source based path + ${COMPRESSONATOR_ROOT}/sdk/include/ # Installer based path ) target_link_libraries(framework_example1 diff --git a/examples/framework_example1/framework_example1.cpp b/examples/framework_example1/framework_example1.cpp index 41d23a195..ef0612d21 100644 --- a/examples/framework_example1/framework_example1.cpp +++ b/examples/framework_example1/framework_example1.cpp @@ -32,7 +32,7 @@ #include #include -#include "CMP_Framework.h" +#include "cmp_framework.h" // Example code using high level SDK API's optimized with MultiThreading for processing a single image // Note:Limited error checking is done on user arguments, so all parameters must be correct in this example diff --git a/examples/framework_example2/cmakelists.txt b/examples/framework_example2/cmakelists.txt index 7dcf3d75f..db16eb9a0 100644 --- a/examples/framework_example2/cmakelists.txt +++ b/examples/framework_example2/cmakelists.txt @@ -6,13 +6,13 @@ add_executable(framework_example2) target_sources(framework_example2 PRIVATE - Framework_Example2.cpp + framework_example2.cpp ) target_include_directories(framework_example2 PUBLIC ./ - ${PROJECT_SOURCE_DIR}/CMP_Framework/ # Source based path - ${COMPRESSONATOR_ROOT}/SDK/include/ # Installer based path + ${PROJECT_SOURCE_DIR}/cmp_framework/ # Source based path + ${COMPRESSONATOR_ROOT}/sdk/include/ # Installer based path ) target_link_libraries(framework_example2 diff --git a/examples/framework_example2/framework_example2.cpp b/examples/framework_example2/framework_example2.cpp index 976589949..4e77da9f7 100644 --- a/examples/framework_example2/framework_example2.cpp +++ b/examples/framework_example2/framework_example2.cpp @@ -31,7 +31,7 @@ #include #include -#include "CMP_Framework.h" +#include "cmp_framework.h" #ifdef _WIN32 #include diff --git a/examples/framework_example3/cmakelists.txt b/examples/framework_example3/cmakelists.txt index a5b6a0750..5f8eb00bc 100644 --- a/examples/framework_example3/cmakelists.txt +++ b/examples/framework_example3/cmakelists.txt @@ -6,12 +6,12 @@ add_executable(framework_example3) target_sources(framework_example3 PRIVATE - Framework_Example3.cpp + framework_example3.cpp ) target_include_directories(framework_example3 PUBLIC ./ - ${PROJECT_SOURCE_DIR}/CMP_Framework/ # Source based path - ${COMPRESSONATOR_ROOT}/SDK/include/ # Installer based path + ${PROJECT_SOURCE_DIR}/cmp_framework/ # Source based path + ${COMPRESSONATOR_ROOT}/sdk/include/ # Installer based path ) target_link_libraries(framework_example3 diff --git a/examples/framework_example3/framework_example3.cpp b/examples/framework_example3/framework_example3.cpp index 53e03b7cb..9bbeb2835 100644 --- a/examples/framework_example3/framework_example3.cpp +++ b/examples/framework_example3/framework_example3.cpp @@ -30,7 +30,7 @@ #include #include -#include "CMP_Framework.h" +#include "cmp_framework.h" #ifdef _WIN32 #include diff --git a/examples/framework_example4/cmakelists.txt b/examples/framework_example4/cmakelists.txt index 9aa14657f..b9ff666be 100644 --- a/examples/framework_example4/cmakelists.txt +++ b/examples/framework_example4/cmakelists.txt @@ -6,12 +6,12 @@ add_executable(framework_example4) target_sources(framework_example4 PRIVATE - Framework_Example4.cpp + framework_example4.cpp ) target_include_directories(framework_example4 PUBLIC ./ - ${PROJECT_SOURCE_DIR}/CMP_Framework/ # Source based path - ${COMPRESSONATOR_ROOT}/SDK/include/ # Installer based path + ${PROJECT_SOURCE_DIR}/cmp_framework/ # Source based path + ${COMPRESSONATOR_ROOT}/sdk/include/ # Installer based path ) target_link_libraries(framework_example4 diff --git a/examples/framework_example4/framework_example4.cpp b/examples/framework_example4/framework_example4.cpp index 11f070a33..97114ef25 100644 --- a/examples/framework_example4/framework_example4.cpp +++ b/examples/framework_example4/framework_example4.cpp @@ -56,7 +56,7 @@ #include #include -#include "CMP_Framework.h" +#include "cmp_framework.h" #ifdef _WIN32 #include diff --git a/examples/prototype/cmakelists.txt b/examples/prototype/cmakelists.txt index 999a12c76..b4893b452 100644 --- a/examples/prototype/cmakelists.txt +++ b/examples/prototype/cmakelists.txt @@ -7,18 +7,17 @@ add_executable(cmp_prototype) target_sources(cmp_prototype PRIVATE cmp_prototype.cpp - ${PROJECT_SOURCE_DIR}/External/glad/include/glad/glad.h - ${PROJECT_SOURCE_DIR}/External/glad/src/glad.c ) + target_include_directories(cmp_prototype PUBLIC ./ - ${PROJECT_SOURCE_DIR}/CMP_Framework # compute_base.h - ${PROJECT_SOURCE_DIR}/CMP_Core/shaders # common_def.h - ${PROJECT_SOURCE_DIR}/CMP_Core/source # cmp_math_vec4.h - ${PROJECT_SOURCE_DIR}/Applications/_Libs/CMP_Math #cmp_math_common.h - ${PROJECT_SOURCE_DIR}/Applications/_Plugins/Common # STB_Image - ${PROJECT_SOURCE_DIR}/External/glad/include/ - ${PROJECT_SOURCE_DIR}/External/glad/include/glad + ${PROJECT_SOURCE_DIR}/cmp_framework # compute_base.h + ${PROJECT_SOURCE_DIR}/cmp_core/shaders # common_def.h + ${PROJECT_SOURCE_DIR}/cmp_core/source # cmp_math_vec4.h + ${PROJECT_SOURCE_DIR}/applications/_libs/cmp_math #cmp_math_common.h + ${PROJECT_SOURCE_DIR}/applications/_plugins/common # stb_image + ${PROJECT_SOURCE_DIR}/external/glad/include/ + ${PROJECT_SOURCE_DIR}/external/glad/include/glad ) target_link_libraries(cmp_prototype @@ -27,6 +26,7 @@ target_link_libraries(cmp_prototype ExtGLFW CMP_Framework CompressonatorLIB + d3d11.lib ) set_target_properties(cmp_prototype diff --git a/examples/sdk_example1/cmakelists.txt b/examples/sdk_example1/cmakelists.txt index 4f7d670c5..eba7497da 100644 --- a/examples/sdk_example1/cmakelists.txt +++ b/examples/sdk_example1/cmakelists.txt @@ -8,14 +8,14 @@ add_dependencies(sdk_example1 dds_helper) target_sources(sdk_example1 PRIVATE - SDK_Example1.cpp + sdk_example1.cpp ) target_include_directories(sdk_example1 PUBLIC ./ - ${PROJECT_SOURCE_DIR}/CMP_CompressonatorLib/ # Source based path - ${PROJECT_SOURCE_DIR}/Examples/common/ # Source based path - ${COMPRESSONATOR_ROOT}/SDK/include/ # Installer based path + ${PROJECT_SOURCE_DIR}/cmp_compressonatorlib/ # source based path + ${PROJECT_SOURCE_DIR}/examples/common/ # source based path + ${COMPRESSONATOR_ROOT}/sdk/include/ # installer based path ) diff --git a/examples/sdk_example1/sdk_example1.cpp b/examples/sdk_example1/sdk_example1.cpp index 92f661895..aa9d180db 100644 --- a/examples/sdk_example1/sdk_example1.cpp +++ b/examples/sdk_example1/sdk_example1.cpp @@ -28,7 +28,7 @@ // Compressonator_xx.lib For static libs xx is either MD, MT or MDd or MTd, // When using DLL builds make sure the Compressonator_xx_DLL.dll is in exe path -#include "Compressonator.h" +#include "compressonator.h" // The Helper code is provided to load Textures from a DDS file (Support Images and Compressed formats supported by DX9) // Compressed images can also be saved using DDS File (Support Images and Compression format supported by DX9 and partial @@ -38,7 +38,7 @@ // to hold the image buffers used for processing. // -#include "DDS_Helpers.h" +#include "dds_helpers.h" #include #include diff --git a/examples/sdk_example2/cmakelists.txt b/examples/sdk_example2/cmakelists.txt index bbd892df2..d0287e076 100644 --- a/examples/sdk_example2/cmakelists.txt +++ b/examples/sdk_example2/cmakelists.txt @@ -9,14 +9,14 @@ add_dependencies(sdk_example2 dds_helper) target_sources(sdk_example2 PRIVATE - SDK_Example2.cpp + sdk_example2.cpp ) target_include_directories(sdk_example2 PUBLIC ./ - ${PROJECT_SOURCE_DIR}/CMP_CompressonatorLib/ # Source based path - ${PROJECT_SOURCE_DIR}/Examples/common/ # Source based path - ${COMPRESSONATOR_ROOT}/SDK/include/ # Installer based path + ${PROJECT_SOURCE_DIR}/cmp_compressonatorlib/ # Source based path + ${PROJECT_SOURCE_DIR}/examples/common/ # Source based path + ${COMPRESSONATOR_ROOT}/sdk/include/ # Installer based path ) target_link_libraries(sdk_example2 diff --git a/examples/sdk_example2/sdk_example2.cpp b/examples/sdk_example2/sdk_example2.cpp index 554c20c50..d346bbb90 100644 --- a/examples/sdk_example2/sdk_example2.cpp +++ b/examples/sdk_example2/sdk_example2.cpp @@ -27,13 +27,13 @@ // Compressonator_xx.lib For static libs xx is either MD, MT or MDd or MTd, // When using DLL builds make sure the Compressonator_xx_DLL.dll is in exe path -#include "Compressonator.h" +#include "compressonator.h" // The Helper code is provided to load Textures from a DDS file (Support Images and Compressed formats supported by DX9) // Compressed images can also be saved using DDS File (Support Images and Compression format supported by DX9 and partial // formats for DX10) -#include "DDS_Helpers.h" +#include "dds_helpers.h" #include #include diff --git a/examples/sdk_example3/cmakelists.txt b/examples/sdk_example3/cmakelists.txt index c658139b1..d5b68a6aa 100644 --- a/examples/sdk_example3/cmakelists.txt +++ b/examples/sdk_example3/cmakelists.txt @@ -8,14 +8,14 @@ add_dependencies(sdk_example3 dds_helper) target_sources(sdk_example3 PRIVATE - SDK_Example3.cpp + sdk_example3.cpp ) target_include_directories(sdk_example3 PUBLIC ./ - ${PROJECT_SOURCE_DIR}/CMP_CompressonatorLib/ # Source based path - ${PROJECT_SOURCE_DIR}/Examples/common/ # Source based path - ${COMPRESSONATOR_ROOT}/SDK/include/ # Installer based path + ${PROJECT_SOURCE_DIR}/cmp_compressonatorlib/ # Source based path + ${PROJECT_SOURCE_DIR}/examples/common/ # Source based path + ${COMPRESSONATOR_ROOT}/sdk/include/ # Installer based path ) target_link_libraries(sdk_example3 diff --git a/examples/sdk_example3/sdk_example3.cpp b/examples/sdk_example3/sdk_example3.cpp index 4e4d6388f..9aff425ef 100644 --- a/examples/sdk_example3/sdk_example3.cpp +++ b/examples/sdk_example3/sdk_example3.cpp @@ -28,13 +28,13 @@ #include -#include "Compressonator.h" +#include "compressonator.h" // The Helper code is provided to load Textures from a DDS file (Support Images and Compressed formats supported by DX9) // Compressed images can also be saved using DDS File (Support Images and Compression format supported by DX9 and partial // formats for DX10) -#include "DDS_Helpers.h" +#include "dds_helpers.h" // Example of low level API that give access to compression blocks (4x4) for BC7 diff --git a/external/cmake/cmakelists.txt b/external/cmake/cmakelists.txt index 5b64e824c..c416ae582 100644 --- a/external/cmake/cmakelists.txt +++ b/external/cmake/cmakelists.txt @@ -1,7 +1,7 @@ -# CMakeLists.txt +cmake_minimum_required(VERSION 3.13) + message(STATUS "++++++++++++++++++ External CMAKE subfolder" ) # Compressonator Dependencies -cmake_minimum_required(VERSION 3.13) project(Compressonator) @@ -25,7 +25,7 @@ if (NOT (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "Debug endif () -include(${CMAKE_CURRENT_LIST_DIR}/DependencyInfo.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/dependencyinfo.cmake) message(STATUS "BUILD_SHARED_LIBS -- ${BUILD_SHARED_LIBS}") message(STATUS "CMAKE_BUILD_TYPE -- ${CMAKE_BUILD_TYPE}") @@ -37,7 +37,7 @@ message(STATUS "NUM_PARALLEL_JOBS -- ${NUM_PARALLEL_JOBS}") # Dependencies message(STATUS "====== CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}" ) -add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/CustomTargets) +add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/customtargets) # Write a generic c++ source file to compile file( diff --git a/external/cmake/customtargets/customtarget_glew.cmake b/external/cmake/customtargets/customtarget_glew.cmake index 37de46ef3..e80eb51fc 100644 --- a/external/cmake/customtargets/customtarget_glew.cmake +++ b/external/cmake/customtargets/customtarget_glew.cmake @@ -4,7 +4,7 @@ # G L E W # ==================================================== set(GLEW_VERSION 2.1.0) -get_filename_component(GLEW_DIR ${COMPRESSONATOR_PROJECT_DIR}/External/glew/glew-submodule ABSOLUTE) +get_filename_component(GLEW_DIR ${COMPRESSONATOR_PROJECT_DIR}/external/glew/glew-submodule ABSOLUTE) set(GLEW_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/glew-${GLEW_VERSION}) file(MAKE_DIRECTORY ${GLEW_BINARY_DIR}) diff --git a/external/cmake/customtargets/customtarget_glslang.cmake b/external/cmake/customtargets/customtarget_glslang.cmake index ba1d928be..1d9f2dd54 100644 --- a/external/cmake/customtargets/customtarget_glslang.cmake +++ b/external/cmake/customtargets/customtarget_glslang.cmake @@ -1,5 +1,5 @@ -get_filename_component(GLSLANG_DIR ${COMPRESSONATOR_PROJECT_DIR}/External/vulkan/vulkan-submodule/${CMAKE_SYSTEM_NAME}/glslang ABSOLUTE) +get_filename_component(GLSLANG_DIR ${COMPRESSONATOR_PROJECT_DIR}/external/vulkan/vulkan-submodule/${CMAKE_SYSTEM_NAME}/glslang ABSOLUTE) set(GLSLANG_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/glslang) file(MAKE_DIRECTORY ${GLSLANG_BUILD_DIR}) diff --git a/external/cmake/customtargets/customtarget_libpng.cmake b/external/cmake/customtargets/customtarget_libpng.cmake index d217c11cb..79ab14789 100644 --- a/external/cmake/customtargets/customtarget_libpng.cmake +++ b/external/cmake/customtargets/customtarget_libpng.cmake @@ -4,7 +4,7 @@ # L I B P N G # ==================================================== set(LIBPNG_VERSION 1.6.37) -get_filename_component(LIBPNG_DIR ${COMPRESSONATOR_PROJECT_DIR}/External/libpng/libpng-submodule ABSOLUTE) +get_filename_component(LIBPNG_DIR ${COMPRESSONATOR_PROJECT_DIR}/external/libpng/libpng-submodule ABSOLUTE) set(LIBPNG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libpng-${LIBPNG_VERSION}) file(MAKE_DIRECTORY ${LIBPNG_BINARY_DIR}) diff --git a/external/cmake/customtargets/customtarget_libtiff.cmake b/external/cmake/customtargets/customtarget_libtiff.cmake index 79436605a..87c733c39 100644 --- a/external/cmake/customtargets/customtarget_libtiff.cmake +++ b/external/cmake/customtargets/customtarget_libtiff.cmake @@ -4,7 +4,7 @@ # L I B T I F F # ==================================================== set(LIBTIFF_VERSION 4.1.0) -get_filename_component(LIBTIFF_DIR ${COMPRESSONATOR_PROJECT_DIR}/External/libtiff/libtiff-submodule ABSOLUTE) +get_filename_component(LIBTIFF_DIR ${COMPRESSONATOR_PROJECT_DIR}/external/libtiff/libtiff-submodule ABSOLUTE) set(LIBTIFF_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtiff-${LIBTIFF_VERSION}) file(MAKE_DIRECTORY ${LIBTIFF_BINARY_DIR}) diff --git a/external/cmake/customtargets/customtarget_opencv.cmake b/external/cmake/customtargets/customtarget_opencv.cmake index 79160a3fa..e577fb457 100644 --- a/external/cmake/customtargets/customtarget_opencv.cmake +++ b/external/cmake/customtargets/customtarget_opencv.cmake @@ -5,7 +5,7 @@ # ==================================================== set(OPENCV_VERSION 4.1.2) set(OPENCV_VERSION_SUFFIX 412) -get_filename_component(OPENCV_CMP_DIR ${COMPRESSONATOR_PROJECT_DIR}/External/opencv ABSOLUTE) +get_filename_component(OPENCV_CMP_DIR ${COMPRESSONATOR_PROJECT_DIR}/external/opencv ABSOLUTE) get_filename_component(OPENCV_DIR ${OPENCV_CMP_DIR}/opencv-submodule ABSOLUTE) # OpenCV has a weird install layout on windows. So we need to carefully split every diff --git a/external/cmake/customtargets/customtarget_openexr.cmake b/external/cmake/customtargets/customtarget_openexr.cmake index cdd5fa0a1..fdd1713c4 100644 --- a/external/cmake/customtargets/customtarget_openexr.cmake +++ b/external/cmake/customtargets/customtarget_openexr.cmake @@ -3,7 +3,7 @@ message(STATUS "++++++++++++++++++OpenEXR Custom TargetCalled" ) set(OPENEXR_VERSION 5754217) -get_filename_component(OPENEXR_DIR ${COMPRESSONATOR_PROJECT_DIR}/External/openexr ABSOLUTE) +get_filename_component(OPENEXR_DIR ${COMPRESSONATOR_PROJECT_DIR}/external/openexr ABSOLUTE) set(OPENEXR_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/openexr-${OPENEXR_VERSION}) file(MAKE_DIRECTORY ${OPENEXR_BINARY_DIR}) diff --git a/external/cmake/customtargets/customtarget_zlib.cmake b/external/cmake/customtargets/customtarget_zlib.cmake index bda378e1e..13f6aecce 100644 --- a/external/cmake/customtargets/customtarget_zlib.cmake +++ b/external/cmake/customtargets/customtarget_zlib.cmake @@ -4,7 +4,7 @@ # Z L I B # ==================================================== set(ZLIB_VERSION 1.2.10) -get_filename_component(ZLIB_CMP_DIR ${COMPRESSONATOR_PROJECT_DIR}/External/zlib ABSOLUTE) +get_filename_component(ZLIB_CMP_DIR ${COMPRESSONATOR_PROJECT_DIR}/external/zlib ABSOLUTE) get_filename_component(ZLIB_DIR ${ZLIB_CMP_DIR}/zlib-submodule ABSOLUTE) set(ZLIB_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/zlib-${ZLIB_VERSION}) diff --git a/external/cmake/customtargets/dependency_vulkan.cmake b/external/cmake/customtargets/dependency_vulkan.cmake index dd7553c68..42d161c3a 100644 --- a/external/cmake/customtargets/dependency_vulkan.cmake +++ b/external/cmake/customtargets/dependency_vulkan.cmake @@ -11,7 +11,7 @@ if (NOT DEFINED DEPENDENCY_VULKAN_INCLUDE) set(DEPENDENCY_VULKAN_INCLUDE ON) - include(${COMPRESSONATOR_PROJECT_DIR}/External/vulkan/CMakeLists.txt) + include(${COMPRESSONATOR_PROJECT_DIR}/external/vulkan/CMakeLists.txt) foreach(_lib ${Vulkan_LIBRARIES}) get_filename_component(_lib_dir ${_lib} DIRECTORY) diff --git a/external/cmakelists.txt b/external/cmakelists.txt index 22671c63e..6a8ff6aa3 100644 --- a/external/cmakelists.txt +++ b/external/cmakelists.txt @@ -4,8 +4,6 @@ set(FOLDER_NAME "External") message(STATUS "++++++++++++++++++External CMakeList called" ) -include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) - include(${CMAKE_CURRENT_LIST_DIR}/glew/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/glm/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/opengl/CMakeLists.txt) @@ -40,7 +38,7 @@ find_package(Threads REQUIRED QUIET) # ==================================================== # D I R E C T X # ==================================================== -if (CMP_HOST_WINDOWS) +if (OPTION_CMP_DIRECTX ) message(STATUS "++++++++++++++++++ D I R E C T X" ) add_library(ExtDirectX INTERFACE) @@ -55,7 +53,7 @@ endif() # ==================================================== # D I R E C T X T E X # ==================================================== -if (CMP_HOST_WINDOWS) +if (OPTION_CMP_DIRECTX ) message(STATUS "++++++++++++++++++ D I R E C T X T E X" ) include(${CMAKE_CURRENT_LIST_DIR}/directxtex/CMakeLists.txt) # add_library(ExtDirectXTex INTERFACE) diff --git a/external/glew/cmakelists.txt b/external/glew/cmakelists.txt index b150be21c..ac4f3095f 100644 --- a/external/glew/cmakelists.txt +++ b/external/glew/cmakelists.txt @@ -1,8 +1,7 @@ -# CMakeLists.txt -message(STATUS "++++++++++++++++++ External-GLEW" ) - cmake_minimum_required(VERSION 3.13) +message(STATUS "++++++++++++++++++ External-GLEW" ) + # if(POLICY CMP0091) # cmake_policy(SET CMP0091 NEW) # endif() diff --git a/external/glfw/cmakelists.txt b/external/glfw/cmakelists.txt index 0ef86ba8a..eea63f39d 100644 --- a/external/glfw/cmakelists.txt +++ b/external/glfw/cmakelists.txt @@ -1,8 +1,7 @@ -# CMakeLists.txt -message(STATUS "++++++++++++++++++ External GLFW" ) - cmake_minimum_required(VERSION 3.13) +message(STATUS "++++++++++++++++++ External GLFW" ) + # if(POLICY CMP0091) # cmake_policy(SET CMP0091 NEW) # endif() diff --git a/external/ktx/cmakelists.txt b/external/ktx/cmakelists.txt index 58a16fa1a..b34d10b52 100644 --- a/external/ktx/cmakelists.txt +++ b/external/ktx/cmakelists.txt @@ -1,24 +1,25 @@ +cmake_minimum_required(VERSION 3.13) + # CMakeLists.txt message(STATUS "++++++++++++++++++ " ) message(STATUS "++++++++++++++++++ External-KTX" ) message(STATUS "++++++++++++++++++ " ) -cmake_minimum_required(VERSION 3.13) - # if(POLICY CMP0091) # cmake_policy(SET CMP0091 NEW) # endif() -# build project files -ExternalProject_Add(extern_ktx - PREFIX ${PROJECT_SOURCE_DIR}/../common/lib/ext/ktx - SOURCE_DIR ${PROJECT_SOURCE_DIR}/../common/lib/ext/ktx - BINARY_DIR ${PROJECT_SOURCE_DIR}/../common/lib/ext/ktx/build - DOWNLOAD_DIR . - CMAKE_ARGS - -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_SOURCE_DIR}/../common/lib/ext/ktx -) - +if (CMP_HOST_WINDOWS) + # build project files + ExternalProject_Add(extern_ktx + PREFIX ${PROJECT_SOURCE_DIR}/../common/lib/ext/ktx + SOURCE_DIR ${PROJECT_SOURCE_DIR}/../common/lib/ext/ktx + BINARY_DIR ${PROJECT_SOURCE_DIR}/../common/lib/ext/ktx/build + DOWNLOAD_DIR . + CMAKE_ARGS + -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_SOURCE_DIR}/../common/lib/ext/ktx + ) +endif() #project(CompressonatorGLEW) add_library(ExtKTX INTERFACE) diff --git a/external/opencv/cmakelists.txt b/external/opencv/cmakelists.txt index 3c1175614..529b949c7 100644 --- a/external/opencv/cmakelists.txt +++ b/external/opencv/cmakelists.txt @@ -1,7 +1,7 @@ -message(STATUS "(1)---------------------- OpenCV CmakeList for ${CMAKE_CURRENT_LIST_DIR}" ) - cmake_minimum_required(VERSION 3.13) +message(STATUS "(1)---------------------- OpenCV CmakeList for ${CMAKE_CURRENT_LIST_DIR}" ) + add_library(ExtOpenCV INTERFACE) set(ExtOpenCV_BIN_PATH ${PROJECT_SOURCE_DIR}/../common/lib/ext/opencv/2.49/x64/VS2015/bin) diff --git a/external/openexr/cmakelists.txt b/external/openexr/cmakelists.txt index bf1151242..ead31328a 100644 --- a/external/openexr/cmakelists.txt +++ b/external/openexr/cmakelists.txt @@ -1,24 +1,17 @@ +cmake_minimum_required(VERSION 3.13) + # CMakeLists.txt message(STATUS "++++++++++++++++++External OpenEXR CMakeList called" ) -cmake_minimum_required(VERSION 3.13) add_library(ExtOpenEXR INTERFACE) -# target_link_libraries(ExtOpenEXR INTERFACE -# ${CMAKE_CURRENT_LIST_DIR}/../../../common/lib/ext/openexr/openexr-2.2.0/VS2015/x64/lib -# ${CMAKE_CURRENT_LIST_DIR}/../../../common/lib/ext/openexr/ilmbase-2.2.0/VS2015/x64/lib -# ) - +if (CMP_HOST_WINDOWS) target_include_directories(ExtOpenEXR INTERFACE ${CMAKE_CURRENT_LIST_DIR}/../../../common/lib/ext/openexr/openexr-2.2.0/VS2015/x64/include/OpenEXR ${CMAKE_CURRENT_LIST_DIR}/../../../common/lib/ext/openexr/ilmbase-2.2.0/VS2015/x64/include/OpenEXR ) -# if(POLICY CMP0091) -# cmake_policy(SET CMP0091 NEW) -# endif() -# -# project(CompressonatorOpenEXR) -# -# add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../../../Common/Lib/Ext/openexr/ ${CMAKE_CURRENT_BINARY_DIR}/../../../Common/Lib/Ext/openexr/) -# add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../../../Common/Lib/Ext/openexr/IlmBase ${CMAKE_CURRENT_BINARY_DIR}/../../../Common/Lib/Ext/openexr/IlmBase) +else() +target_include_directories(ExtOpenEXR INTERFACE ${OpenEXR_INCLUDE_DIRS}) +endif() + diff --git a/external/qt5/cmakelists.txt b/external/qt5/cmakelists.txt index 8744066a0..238f6c377 100644 --- a/external/qt5/cmakelists.txt +++ b/external/qt5/cmakelists.txt @@ -1,12 +1,12 @@ # CMakeCustomTargets CMakeLists.txt -message(STATUS "++++++++++++++++++ External-QT" ) +message(STATUS "++++++++++++++++++ External-QT " ${QT_PACKAGE_ROOT} ) #if (NOT DEFINED ENV{QTDIR}) # message(FATAL_ERROR "A 'QTDIR' environment variable is required") #endif() -find_package(Qt5 COMPONENTS REQUIRED Core ) +find_package(Qt5 COMPONENTS REQUIRED Core HINTS ${QT_PACKAGE_ROOT}) get_target_property(QtCore_location Qt5::Core LOCATION) @@ -40,6 +40,7 @@ endif() find_package(Qt5 REQUIRED QUIET COMPONENTS Core Gui OpenGL Qml QuickWidgets WebEngineWidgets Widgets Xml PATHS ${QT_FIND_ROOT_PATH} + HINTS ${QT_PACKAGE_ROOT} ) add_library(ExtQt5 INTERFACE) diff --git a/external/rapidxml/cmakelists.txt b/external/rapidxml/cmakelists.txt index 94d4d84f5..a9e476f12 100644 --- a/external/rapidxml/cmakelists.txt +++ b/external/rapidxml/cmakelists.txt @@ -1,7 +1,7 @@ message(STATUS "++++++++++++++++++ External-RAPIDXML" ) -set(RAPIDXML_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../Common/Lib/Ext/rapidxml/) +set(RAPIDXML_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../common/lib/ext/rapidxml/) add_library(ExtRapidXML INTERFACE) diff --git a/external/vulkan/cmakelists.txt b/external/vulkan/cmakelists.txt index c2a183321..ce4a4e70e 100644 --- a/external/vulkan/cmakelists.txt +++ b/external/vulkan/cmakelists.txt @@ -57,17 +57,17 @@ if (CMP_HOST_APPLE) elseif(CMP_HOST_LINUX) - # More details can be found on this issue: https://vulkan.lunarg.com/issue/view/5ed6eca8e0d2a37f6e19cefc - set(RENAME_HACK bash -c "find . -type f -exec sed -i 's,root/sdk-build/${VULKAN_VERSION},${VULKAN_OUTPUT_DIR},' {} \\\;") - cmp_execute_process(RENAME_HACK ${VULKAN_OUTPUT_DIR}) - - get_filename_component(VULKAN_SDK ${COMPRESSONATOR_PROJECT_DIR}/External/build-out/Linux/vulkan ABSOLUTE) - if (NOT EXISTS VULKAN_SDK) - file(COPY $ENV{VULKAN_SDK} ${VULKAN_SDK}) - endif() - set(ENV{VULKAN_SDK} ${VULKAN_SDK}) - - find_package(Vulkan REQUIRED) +# More details can be found on this issue: https://vulkan.lunarg.com/issue/view/5ed6eca8e0d2a37f6e19cefc +# set(RENAME_HACK bash -c "find . -type f -exec sed -i 's,root/sdk-build/${VULKAN_VERSION},${VULKAN_OUTPUT_DIR},' {} \\\;") +# cmp_execute_process(RENAME_HACK ${VULKAN_OUTPUT_DIR}) +# +# get_filename_component(VULKAN_SDK ${COMPRESSONATOR_PROJECT_DIR}/External/build-out/Linux/vulkan ABSOLUTE) +# if (NOT EXISTS VULKAN_SDK) +# file(COPY $ENV{VULKAN_SDK} ${VULKAN_SDK}) +# endif() +# set(ENV{VULKAN_SDK} ${VULKAN_SDK}) +# +# find_package(Vulkan REQUIRED) elseif(CMP_HOST_WINDOWS) diff --git a/external/zlib/cmakelists.txt b/external/zlib/cmakelists.txt index 8541eed36..b3caa176e 100644 --- a/external/zlib/cmakelists.txt +++ b/external/zlib/cmakelists.txt @@ -1,5 +1,3 @@ -# CMakeLists.txt - cmake_minimum_required(VERSION 3.13) #if(POLICY CMP0091) diff --git a/gstyle.bat b/gstyle.bat deleted file mode 100644 index affee920b..000000000 --- a/gstyle.bat +++ /dev/null @@ -1,2 +0,0 @@ -astyle --style=google --recursive *.cpp *.h -pause \ No newline at end of file diff --git a/installer/amdcompressgui_64.aip b/installer/amdcompressgui_64.aip index f6c843ea8..5ba7c306f 100644 --- a/installer/amdcompressgui_64.aip +++ b/installer/amdcompressgui_64.aip @@ -104,7 +104,6 @@ - @@ -112,11 +111,9 @@ - - - - + + @@ -136,14 +133,14 @@ - + - + @@ -154,8 +151,8 @@ - + @@ -177,8 +174,12 @@ + + + + @@ -195,47 +196,22 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - @@ -247,17 +223,15 @@ - - - - + + - - + + @@ -270,21 +244,17 @@ - + - - - - @@ -297,6 +267,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -311,6 +303,7 @@ + @@ -320,6 +313,7 @@ + @@ -327,8 +321,8 @@ - - + + @@ -336,11 +330,12 @@ - - - - + + + + + @@ -518,12 +513,16 @@ - + + - - + + + + + @@ -542,11 +541,13 @@ - + + + - + @@ -558,17 +559,19 @@ - - + + - - + + + + @@ -811,8 +814,8 @@ - - + + diff --git a/scripts/fetch_dependencies.py b/scripts/fetch_dependencies.py index 555dbbc43..7756b15c0 100644 --- a/scripts/fetch_dependencies.py +++ b/scripts/fetch_dependencies.py @@ -96,9 +96,9 @@ "https://github.com/GPUOpen-LibrariesAndSDKs/OCL-SDK/files/1406216/lightOCLSDK.zip" : "../../common/lib/ext/opencl/", } -# need opencl and gltf also downloadMappingLin = { - "https://github.com/microsoft/DirectXTex/archive/jun2020b.tar.gz" : "../../common/lib/ext/directxtex/", + "http://download.savannah.nongnu.org/releases/openexr/ilmbase-2.2.0.tar.gz": "../../common/lib/ext/openexr2/ilmbase", + "http://download.savannah.nongnu.org/releases/openexr/openexr-2.2.0.tar.gz": "../../common/lib/ext/openexr2/openexr", } # for each dependency - test if it has already been fetched - if not, then fetch it, otherwise update it to top of tree diff --git a/scripts/initsetup_ubuntu.sh b/scripts/initsetup_ubuntu.sh new file mode 100644 index 000000000..5623e0510 --- /dev/null +++ b/scripts/initsetup_ubuntu.sh @@ -0,0 +1,24 @@ +#run the following command to install prerequisite to build CompressonatorCLI for unix then only run buildCLI_unix.sh +# openexr v2.2 +# If you want to build from source use this +# LD_LIBRARY_PATH=/usr/local/lib +# export LD_LIBRARY_PATH +# wget http://download.savannah.nongnu.org/releases/openexr/ilmbase-2.2.0.tar.gz +# (tar xvfz ilmbase-2.2.0.tar.gz && cd ilmbase-2.2.0 && sudo cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ilmbase22build/ . && sudo make -j 4 && sudo make install) +# wget http://download.savannah.nongnu.org/releases/openexr/openexr-2.2.0.tar.gz +# (tar xvfz openexr-2.2.0.tar.gz && cd openexr-2.2.0 && sudo cmake -DILMBASE_PACKAGE_PREFIX=/usr/local/ilmbase22build/ -DCMAKE_INSTALL_PREFIX=/usr/local/openexr22build/ . && sudo make -j 4 && sudo make install) + +version=`lsb_release --release | cut -f2` + +if [ $version = "18.04" ];then + echo "You have Ubuntu 18.04" + sudo apt-get install cmake + sudo apt-get install libglew-dev libegl1-mesa-dev + sudo apt-get install qtdeclarative5-dev + #openexr v2.2. is needed else have to build from source + sudo apt-get install libopenexr-dev + sudo apt-get install libilmbase-dev + sudo apt-get install libopencv-dev +else + echo "Version other than 18.04 detected. This script only support 18.04. You might need to install the prerequisite packages with the specific version as listed in initsetup_unix.sh above manually." +fi diff --git a/scripts/linux_build_apps.sh b/scripts/linux_build_apps.sh new file mode 100644 index 000000000..9e9f2dd89 --- /dev/null +++ b/scripts/linux_build_apps.sh @@ -0,0 +1,6 @@ +cd .. +export VULKAN_SDK=~/vulkan/1.2.141.2 +QT_ROOT=~/Qt5.12.6/5.12.6/gcc_64 +cmake -DQT_PACKAGE_ROOT=$QT_ROOT . +make +