From d586ffa79c1ab9b429ffc667a4a221c3efcda213 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 11 Apr 2020 19:08:22 +0200 Subject: [PATCH] - const-ified the palette pointers in the texture creation code. - fixed includes. --- src/common/textures/formats/pngtexture.cpp | 4 ++-- src/common/textures/image.cpp | 4 ++-- src/common/textures/image.h | 4 ++-- src/common/textures/imagetexture.cpp | 2 +- src/common/textures/skyboxtexture.cpp | 2 +- src/common/textures/skyboxtexture.h | 2 +- src/common/textures/texture.cpp | 2 +- src/common/textures/textures.h | 4 ++-- src/r_data/gldefs.cpp | 2 +- src/rendering/2d/f_wipe.cpp | 4 ++-- src/rendering/gl/renderer/gl_renderstate.h | 2 +- src/rendering/gl/textures/gl_hwtexture.cpp | 2 +- src/rendering/gl/textures/gl_samplers.cpp | 2 +- src/rendering/hwrenderer/models/hw_models.cpp | 2 +- src/rendering/hwrenderer/scene/hw_decal.cpp | 2 +- src/rendering/hwrenderer/scene/hw_drawlistadd.cpp | 2 +- src/rendering/hwrenderer/scene/hw_flats.cpp | 2 +- src/rendering/hwrenderer/scene/hw_portal.h | 2 +- src/rendering/hwrenderer/scene/hw_renderstate.h | 2 +- src/rendering/hwrenderer/scene/hw_sky.cpp | 2 +- src/rendering/hwrenderer/scene/hw_skydome.cpp | 2 +- src/rendering/hwrenderer/scene/hw_sprites.cpp | 2 +- src/rendering/hwrenderer/scene/hw_walls.cpp | 2 +- src/rendering/hwrenderer/scene/hw_weapon.cpp | 2 +- src/rendering/hwrenderer/textures/hw_precache.cpp | 2 +- src/rendering/hwrenderer/utility/hw_cvars.cpp | 2 +- src/rendering/polyrenderer/backend/poly_hwtexture.cpp | 2 +- src/rendering/polyrenderer/backend/poly_renderstate.h | 2 +- src/rendering/swrenderer/r_swscene.cpp | 2 +- src/rendering/vulkan/renderer/vk_renderstate.h | 2 +- src/rendering/vulkan/textures/vk_hwtexture.cpp | 2 +- src/rendering/vulkan/textures/vk_samplers.cpp | 2 +- 32 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/common/textures/formats/pngtexture.cpp b/src/common/textures/formats/pngtexture.cpp index 58c2b25d4..794892c6c 100644 --- a/src/common/textures/formats/pngtexture.cpp +++ b/src/common/textures/formats/pngtexture.cpp @@ -573,7 +573,7 @@ class FPNGFileTexture : public FTexture { public: FPNGFileTexture (FileReader &lump, int width, int height, uint8_t colortype); - virtual FBitmap GetBgraBitmap(PalEntry *remap, int *trans); + virtual FBitmap GetBgraBitmap(const PalEntry *remap, int *trans); protected: @@ -631,7 +631,7 @@ FPNGFileTexture::FPNGFileTexture (FileReader &lump, int width, int height, uint8 // //=========================================================================== -FBitmap FPNGFileTexture::GetBgraBitmap(PalEntry *remap, int *trans) +FBitmap FPNGFileTexture::GetBgraBitmap(const PalEntry *remap, int *trans) { FBitmap bmp; // Parse pre-IDAT chunks. I skip the CRCs. Is that bad? diff --git a/src/common/textures/image.cpp b/src/common/textures/image.cpp index 9a8f7028e..ef40efd19 100644 --- a/src/common/textures/image.cpp +++ b/src/common/textures/image.cpp @@ -182,7 +182,7 @@ int FImageSource::CopyPixels(FBitmap *bmp, int conversion) return 0; } -int FImageSource::CopyTranslatedPixels(FBitmap *bmp, PalEntry *remap) +int FImageSource::CopyTranslatedPixels(FBitmap *bmp, const PalEntry *remap) { auto ppix = CreatePalettedPixels(false); bmp->CopyPixelData(0, 0, ppix.Data(), Width, Height, Height, 1, 0, remap, nullptr); @@ -195,7 +195,7 @@ int FImageSource::CopyTranslatedPixels(FBitmap *bmp, PalEntry *remap) // //========================================================================== -FBitmap FImageSource::GetCachedBitmap(PalEntry *remap, int conversion, int *ptrans) +FBitmap FImageSource::GetCachedBitmap(const PalEntry *remap, int conversion, int *ptrans) { FBitmap ret; diff --git a/src/common/textures/image.h b/src/common/textures/image.h index cb5a554eb..69042cc44 100644 --- a/src/common/textures/image.h +++ b/src/common/textures/image.h @@ -53,7 +53,7 @@ protected: virtual TArray CreatePalettedPixels(int conversion); virtual int CopyPixels(FBitmap *bmp, int conversion); // This will always ignore 'luminance'. - int CopyTranslatedPixels(FBitmap *bmp, PalEntry *remap); + int CopyTranslatedPixels(FBitmap *bmp, const PalEntry *remap); public: @@ -86,7 +86,7 @@ public: // Unlile for paletted images there is no variant here that returns a persistent bitmap, because all users have to process the returned image into another format. - FBitmap GetCachedBitmap(PalEntry *remap, int conversion, int *trans = nullptr); + FBitmap GetCachedBitmap(const PalEntry *remap, int conversion, int *trans = nullptr); static void ClearImages() { ImageArena.FreeAll(); ImageForLump.Clear(); NextID = 0; } static FImageSource * GetImage(int lumpnum, bool checkflat); diff --git a/src/common/textures/imagetexture.cpp b/src/common/textures/imagetexture.cpp index 4fe578003..3586acae0 100644 --- a/src/common/textures/imagetexture.cpp +++ b/src/common/textures/imagetexture.cpp @@ -73,7 +73,7 @@ FImageTexture::FImageTexture(FImageSource *img, const char *name) noexcept // //=========================================================================== -FBitmap FImageTexture::GetBgraBitmap(PalEntry *p, int *trans) +FBitmap FImageTexture::GetBgraBitmap(const PalEntry *p, int *trans) { return mImage->GetCachedBitmap(p, bNoRemap0? FImageSource::noremap0 : FImageSource::normal, trans); } diff --git a/src/common/textures/skyboxtexture.cpp b/src/common/textures/skyboxtexture.cpp index ea3b406da..0d8a27414 100644 --- a/src/common/textures/skyboxtexture.cpp +++ b/src/common/textures/skyboxtexture.cpp @@ -68,7 +68,7 @@ TArray FSkyBox::Get8BitPixels(bool alphatex) // //----------------------------------------------------------------------------- -FBitmap FSkyBox::GetBgraBitmap(PalEntry *p, int *trans) +FBitmap FSkyBox::GetBgraBitmap(const PalEntry *p, int *trans) { return previous->GetBgraBitmap(p, trans); } diff --git a/src/common/textures/skyboxtexture.h b/src/common/textures/skyboxtexture.h index 2288a4094..07a75f1e8 100644 --- a/src/common/textures/skyboxtexture.h +++ b/src/common/textures/skyboxtexture.h @@ -18,7 +18,7 @@ public: FSkyBox(const char *name); TArray Get8BitPixels(bool alphatex); - FBitmap GetBgraBitmap(PalEntry *, int *trans) override; + FBitmap GetBgraBitmap(const PalEntry *, int *trans) override; FImageSource *GetImage() const override; diff --git a/src/common/textures/texture.cpp b/src/common/textures/texture.cpp index 74ea3c37b..112375ac9 100644 --- a/src/common/textures/texture.cpp +++ b/src/common/textures/texture.cpp @@ -175,7 +175,7 @@ FTexture::~FTexture () // //=========================================================================== -FBitmap FTexture::GetBgraBitmap(PalEntry *remap, int *ptrans) +FBitmap FTexture::GetBgraBitmap(const PalEntry *remap, int *ptrans) { FBitmap bmp; bmp.Create(Width, Height); diff --git a/src/common/textures/textures.h b/src/common/textures/textures.h index 12d6f953c..38a80f8d4 100644 --- a/src/common/textures/textures.h +++ b/src/common/textures/textures.h @@ -312,7 +312,7 @@ public: // Returns the whole texture, stored in column-major order virtual TArray Get8BitPixels(bool alphatex); - virtual FBitmap GetBgraBitmap(PalEntry *remap, int *trans = nullptr); + virtual FBitmap GetBgraBitmap(const PalEntry *remap, int *trans = nullptr); static bool SmoothEdges(unsigned char * buffer,int w, int h); static PalEntry averageColor(const uint32_t *data, int size, int maxout); @@ -514,7 +514,7 @@ public: } FImageSource* GetImage() const override { return mImage; } - FBitmap GetBgraBitmap(PalEntry* p, int* trans) override; + FBitmap GetBgraBitmap(const PalEntry* p, int* trans) override; }; diff --git a/src/r_data/gldefs.cpp b/src/r_data/gldefs.cpp index 2aeac8f42..a8f68d5f1 100644 --- a/src/r_data/gldefs.cpp +++ b/src/r_data/gldefs.cpp @@ -46,7 +46,7 @@ #include "v_video.h" #include "skyboxtexture.h" #include "hwrenderer/postprocessing/hw_postprocessshader.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "texturemanager.h" void AddLightDefaults(FLightDefaults *defaults, double attnFactor); diff --git a/src/rendering/2d/f_wipe.cpp b/src/rendering/2d/f_wipe.cpp index 03de1b916..9282de0db 100644 --- a/src/rendering/2d/f_wipe.cpp +++ b/src/rendering/2d/f_wipe.cpp @@ -28,7 +28,7 @@ #include "f_wipe.h" #include "templates.h" #include "textures/bitmap.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" class FBurnTexture : public FTexture { @@ -41,7 +41,7 @@ public: Height = h; } - FBitmap GetBgraBitmap(PalEntry*, int *trans) override + FBitmap GetBgraBitmap(const PalEntry*, int *trans) override { FBitmap bmp; bmp.Create(Width, Height); diff --git a/src/rendering/gl/renderer/gl_renderstate.h b/src/rendering/gl/renderer/gl_renderstate.h index 9cb76db47..3229e4ba2 100644 --- a/src/rendering/gl/renderer/gl_renderstate.h +++ b/src/rendering/gl/renderer/gl_renderstate.h @@ -28,7 +28,7 @@ #include "matrix.h" #include "hwrenderer/scene//hw_drawstructs.h" #include "hwrenderer/scene//hw_renderstate.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "c_cvars.h" #include "r_defs.h" #include "r_data/r_translate.h" diff --git a/src/rendering/gl/textures/gl_hwtexture.cpp b/src/rendering/gl/textures/gl_hwtexture.cpp index 0d2ec2fc6..26069b1b1 100644 --- a/src/rendering/gl/textures/gl_hwtexture.cpp +++ b/src/rendering/gl/textures/gl_hwtexture.cpp @@ -31,7 +31,7 @@ #include "c_cvars.h" #include "doomtype.h" #include "r_data/colormaps.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "gl_load/gl_interface.h" #include "hwrenderer/utility/hw_cvars.h" diff --git a/src/rendering/gl/textures/gl_samplers.cpp b/src/rendering/gl/textures/gl_samplers.cpp index e5fd90281..fa2082d21 100644 --- a/src/rendering/gl/textures/gl_samplers.cpp +++ b/src/rendering/gl/textures/gl_samplers.cpp @@ -28,7 +28,7 @@ #include "gl/system/gl_debug.h" #include "gl/renderer/gl_renderer.h" #include "gl_samplers.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" namespace OpenGLRenderer { diff --git a/src/rendering/hwrenderer/models/hw_models.cpp b/src/rendering/hwrenderer/models/hw_models.cpp index 8a49cf99c..286ffe1e0 100644 --- a/src/rendering/hwrenderer/models/hw_models.cpp +++ b/src/rendering/hwrenderer/models/hw_models.cpp @@ -35,7 +35,7 @@ #include "g_levellocals.h" #include "i_time.h" #include "cmdlib.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "hwrenderer/data/buffers.h" #include "hwrenderer/data/flatvertices.h" #include "hwrenderer/scene/hw_drawinfo.h" diff --git a/src/rendering/hwrenderer/scene/hw_decal.cpp b/src/rendering/hwrenderer/scene/hw_decal.cpp index 2372a64cd..7747f688b 100644 --- a/src/rendering/hwrenderer/scene/hw_decal.cpp +++ b/src/rendering/hwrenderer/scene/hw_decal.cpp @@ -29,7 +29,7 @@ #include "a_sharedglobal.h" #include "r_utility.h" #include "g_levellocals.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "hwrenderer/utility/hw_cvars.h" #include "hwrenderer/scene/hw_drawstructs.h" #include "hwrenderer/scene/hw_drawinfo.h" diff --git a/src/rendering/hwrenderer/scene/hw_drawlistadd.cpp b/src/rendering/hwrenderer/scene/hw_drawlistadd.cpp index 167802b95..eb81a3170 100644 --- a/src/rendering/hwrenderer/scene/hw_drawlistadd.cpp +++ b/src/rendering/hwrenderer/scene/hw_drawlistadd.cpp @@ -25,7 +25,7 @@ #include "hwrenderer/dynlights/hw_lightbuffer.h" #include "hwrenderer/scene/hw_drawstructs.h" #include "hwrenderer/scene/hw_drawinfo.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" EXTERN_CVAR(Bool, gl_seamless) diff --git a/src/rendering/hwrenderer/scene/hw_flats.cpp b/src/rendering/hwrenderer/scene/hw_flats.cpp index 79a9db8e5..f5af9a466 100644 --- a/src/rendering/hwrenderer/scene/hw_flats.cpp +++ b/src/rendering/hwrenderer/scene/hw_flats.cpp @@ -39,7 +39,7 @@ #include "hwrenderer/utility/hw_cvars.h" #include "hwrenderer/utility/hw_clock.h" #include "hwrenderer/utility/hw_lighting.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "hwrenderer/scene/hw_drawinfo.h" #include "hwrenderer/data/flatvertices.h" #include "hwrenderer/dynlights/hw_lightbuffer.h" diff --git a/src/rendering/hwrenderer/scene/hw_portal.h b/src/rendering/hwrenderer/scene/hw_portal.h index 39ea64db2..63a2f5518 100644 --- a/src/rendering/hwrenderer/scene/hw_portal.h +++ b/src/rendering/hwrenderer/scene/hw_portal.h @@ -6,7 +6,7 @@ #include "hwrenderer/scene/hw_drawinfo.h" #include "hwrenderer/scene/hw_drawstructs.h" #include "hw_renderstate.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" struct HWSkyInfo diff --git a/src/rendering/hwrenderer/scene/hw_renderstate.h b/src/rendering/hwrenderer/scene/hw_renderstate.h index 42092b2e1..6ec91b6c3 100644 --- a/src/rendering/hwrenderer/scene/hw_renderstate.h +++ b/src/rendering/hwrenderer/scene/hw_renderstate.h @@ -6,7 +6,7 @@ #include "hw_drawstructs.h" #include "hw_drawlist.h" #include "matrix.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" struct FColormap; class IVertexBuffer; diff --git a/src/rendering/hwrenderer/scene/hw_sky.cpp b/src/rendering/hwrenderer/scene/hw_sky.cpp index adc22b38a..6bdb8f842 100644 --- a/src/rendering/hwrenderer/scene/hw_sky.cpp +++ b/src/rendering/hwrenderer/scene/hw_sky.cpp @@ -32,7 +32,7 @@ #include "hwrenderer/scene/hw_drawstructs.h" #include "hwrenderer/scene/hw_portal.h" #include "hwrenderer/utility/hw_lighting.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" CVAR(Bool,gl_noskyboxes, false, 0) diff --git a/src/rendering/hwrenderer/scene/hw_skydome.cpp b/src/rendering/hwrenderer/scene/hw_skydome.cpp index ebe6491cc..9b7942383 100644 --- a/src/rendering/hwrenderer/scene/hw_skydome.cpp +++ b/src/rendering/hwrenderer/scene/hw_skydome.cpp @@ -63,7 +63,7 @@ #include "cmdlib.h" #include "skyboxtexture.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "hw_skydome.h" #include "hw_renderstate.h" #include "hw_drawinfo.h" diff --git a/src/rendering/hwrenderer/scene/hw_sprites.cpp b/src/rendering/hwrenderer/scene/hw_sprites.cpp index 111c299ac..889d1c4f8 100644 --- a/src/rendering/hwrenderer/scene/hw_sprites.cpp +++ b/src/rendering/hwrenderer/scene/hw_sprites.cpp @@ -52,7 +52,7 @@ #include "hwrenderer/utility/hw_cvars.h" #include "hwrenderer/utility/hw_clock.h" #include "hwrenderer/utility/hw_lighting.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "hwrenderer/dynlights/hw_dynlightdata.h" #include "hwrenderer/dynlights/hw_lightbuffer.h" #include "hw_renderstate.h" diff --git a/src/rendering/hwrenderer/scene/hw_walls.cpp b/src/rendering/hwrenderer/scene/hw_walls.cpp index 7724106fd..5830d4cc4 100644 --- a/src/rendering/hwrenderer/scene/hw_walls.cpp +++ b/src/rendering/hwrenderer/scene/hw_walls.cpp @@ -32,7 +32,7 @@ #include "actorinlines.h" #include "texturemanager.h" #include "hwrenderer/dynlights/hw_dynlightdata.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "hwrenderer/utility/hw_cvars.h" #include "hwrenderer/utility/hw_clock.h" #include "hwrenderer/utility/hw_lighting.h" diff --git a/src/rendering/hwrenderer/scene/hw_weapon.cpp b/src/rendering/hwrenderer/scene/hw_weapon.cpp index 3cb286741..d0de4e058 100644 --- a/src/rendering/hwrenderer/scene/hw_weapon.cpp +++ b/src/rendering/hwrenderer/scene/hw_weapon.cpp @@ -38,7 +38,7 @@ #include "hwrenderer/models/hw_models.h" #include "hwrenderer/dynlights/hw_dynlightdata.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "hwrenderer/utility/hw_lighting.h" #include "hwrenderer/utility/hw_cvars.h" #include "hwrenderer/scene/hw_drawinfo.h" diff --git a/src/rendering/hwrenderer/textures/hw_precache.cpp b/src/rendering/hwrenderer/textures/hw_precache.cpp index 8d1af7948..fd42db857 100644 --- a/src/rendering/hwrenderer/textures/hw_precache.cpp +++ b/src/rendering/hwrenderer/textures/hw_precache.cpp @@ -32,7 +32,7 @@ #include "actor.h" #include "r_data/models/models.h" #include "skyboxtexture.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "image.h" #include "v_video.h" #include "v_font.h" diff --git a/src/rendering/hwrenderer/utility/hw_cvars.cpp b/src/rendering/hwrenderer/utility/hw_cvars.cpp index 7f4eb832f..348fc8821 100644 --- a/src/rendering/hwrenderer/utility/hw_cvars.cpp +++ b/src/rendering/hwrenderer/utility/hw_cvars.cpp @@ -25,7 +25,7 @@ #include "c_dispatch.h" #include "v_video.h" #include "hw_cvars.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "menu/menu.h" #include "texturemanager.h" diff --git a/src/rendering/polyrenderer/backend/poly_hwtexture.cpp b/src/rendering/polyrenderer/backend/poly_hwtexture.cpp index 44dc2429a..73c063e95 100644 --- a/src/rendering/polyrenderer/backend/poly_hwtexture.cpp +++ b/src/rendering/polyrenderer/backend/poly_hwtexture.cpp @@ -23,7 +23,7 @@ #include "templates.h" #include "c_cvars.h" #include "r_data/colormaps.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "hwrenderer/utility/hw_cvars.h" #include "hwrenderer/scene/hw_renderstate.h" #include "poly_framebuffer.h" diff --git a/src/rendering/polyrenderer/backend/poly_renderstate.h b/src/rendering/polyrenderer/backend/poly_renderstate.h index 6adea2904..e8069ffe8 100644 --- a/src/rendering/polyrenderer/backend/poly_renderstate.h +++ b/src/rendering/polyrenderer/backend/poly_renderstate.h @@ -8,7 +8,7 @@ #include "hwrenderer/scene/hw_drawstructs.h" #include "hwrenderer/scene/hw_renderstate.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" struct HWViewpointUniforms; diff --git a/src/rendering/swrenderer/r_swscene.cpp b/src/rendering/swrenderer/r_swscene.cpp index 5991d3ca1..ed5950f52 100644 --- a/src/rendering/swrenderer/r_swscene.cpp +++ b/src/rendering/swrenderer/r_swscene.cpp @@ -26,7 +26,7 @@ */ #include "hw_ihwtexture.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "swrenderer/r_renderer.h" #include "r_swscene.h" #include "filesystem.h" diff --git a/src/rendering/vulkan/renderer/vk_renderstate.h b/src/rendering/vulkan/renderer/vk_renderstate.h index 73c777eb0..fcdc8efb1 100644 --- a/src/rendering/vulkan/renderer/vk_renderstate.h +++ b/src/rendering/vulkan/renderer/vk_renderstate.h @@ -10,7 +10,7 @@ #include "hwrenderer/scene/hw_drawstructs.h" #include "hwrenderer/scene/hw_renderstate.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" class VkRenderPassSetup; class VkTextureImage; diff --git a/src/rendering/vulkan/textures/vk_hwtexture.cpp b/src/rendering/vulkan/textures/vk_hwtexture.cpp index 6b4ff976b..d91807206 100644 --- a/src/rendering/vulkan/textures/vk_hwtexture.cpp +++ b/src/rendering/vulkan/textures/vk_hwtexture.cpp @@ -23,7 +23,7 @@ #include "templates.h" #include "c_cvars.h" #include "r_data/colormaps.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" #include "hwrenderer/utility/hw_cvars.h" #include "hwrenderer/scene/hw_renderstate.h" #include "vulkan/system/vk_objects.h" diff --git a/src/rendering/vulkan/textures/vk_samplers.cpp b/src/rendering/vulkan/textures/vk_samplers.cpp index 7dd32b878..d82f4bb01 100644 --- a/src/rendering/vulkan/textures/vk_samplers.cpp +++ b/src/rendering/vulkan/textures/vk_samplers.cpp @@ -28,7 +28,7 @@ #include "vulkan/system/vk_device.h" #include "vulkan/system/vk_builders.h" #include "vk_samplers.h" -#include "hwrenderer/textures/hw_material.h" +#include "hw_material.h" struct VkTexFilter {