thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OPENGL: Cleanup. Remove Texture::getHardwareFormat.

Browse source
This commit is contained in:
Johannes Schickel 2016-01-02 05:15:34 +01:00
parent 618adec7b0
commit 8b0cf0c5f7
2 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
backends/graphics/opengl/texture.cpp
View file

@ -349,17 +349,16 @@ Graphics::PixelFormat TextureCLUT8::getFormat() const {
void TextureCLUT8::setColorKey(uint colorKey) { void TextureCLUT8::setColorKey(uint colorKey) {
// We remove all alpha bits from the palette entry of the color key. // We remove all alpha bits from the palette entry of the color key.
// This makes sure its properly handled as color key. // This makes sure its properly handled as color key.
const Graphics::PixelFormat &hardwareFormat = getHardwareFormat(); const uint32 aMask = (0xFF >> _format.aLoss) << _format.aShift;
const uint32 aMask = (0xFF >> hardwareFormat.aLoss) << hardwareFormat.aShift;
if (hardwareFormat.bytesPerPixel == 2) { if (_format.bytesPerPixel == 2) {
uint16 *palette = (uint16 *)_palette + colorKey; uint16 *palette = (uint16 *)_palette + colorKey;
*palette &= ~aMask; *palette &= ~aMask;
} else if (hardwareFormat.bytesPerPixel == 4) { } else if (_format.bytesPerPixel == 4) {
uint32 *palette = (uint32 *)_palette + colorKey; uint32 *palette = (uint32 *)_palette + colorKey;
*palette &= ~aMask; *palette &= ~aMask;
} else { } else {
warning("TextureCLUT8::setColorKey: Unsupported pixel depth %d", hardwareFormat.bytesPerPixel); warning("TextureCLUT8::setColorKey: Unsupported pixel depth %d", _format.bytesPerPixel);
} }
// A palette changes means we need to refresh the whole surface. // A palette changes means we need to refresh the whole surface.
@ -377,14 +376,12 @@ inline void convertPalette(ColorType *dst, const byte *src, uint colors, const G
} // End of anonymous namespace } // End of anonymous namespace
void TextureCLUT8::setPalette(uint start, uint colors, const byte *palData) { void TextureCLUT8::setPalette(uint start, uint colors, const byte *palData) {
const Graphics::PixelFormat &hardwareFormat = getHardwareFormat(); if (_format.bytesPerPixel == 2) {
convertPalette<uint16>((uint16 *)_palette + start, palData, colors, _format);
if (hardwareFormat.bytesPerPixel == 2) { } else if (_format.bytesPerPixel == 4) {
convertPalette<uint16>((uint16 *)_palette + start, palData, colors, hardwareFormat); convertPalette<uint32>((uint32 *)_palette + start, palData, colors, _format);
} else if (hardwareFormat.bytesPerPixel == 4) {
convertPalette<uint32>((uint32 *)_palette + start, palData, colors, hardwareFormat);
} else { } else {
warning("TextureCLUT8::setPalette: Unsupported pixel depth: %d", hardwareFormat.bytesPerPixel); warning("TextureCLUT8::setPalette: Unsupported pixel depth: %d", _format.bytesPerPixel);
} }
// A palette changes means we need to refresh the whole surface. // A palette changes means we need to refresh the whole surface.

9
backends/graphics/opengl/texture.h
View file

@ -172,11 +172,6 @@ public:
uint getWidth() const { return _userPixelData.w; } uint getWidth() const { return _userPixelData.w; }
uint getHeight() const { return _userPixelData.h; } uint getHeight() const { return _userPixelData.h; }
/**
* @return The hardware format of the texture data.
*/
const Graphics::PixelFormat &getHardwareFormat() const { return _format; }
/** /**
* @return The logical format of the texture data. * @return The logical format of the texture data.
*/ */
@ -200,12 +195,12 @@ public:
virtual void setColorKey(uint colorKey) {} virtual void setColorKey(uint colorKey) {}
virtual void setPalette(uint start, uint colors, const byte *palData) {} virtual void setPalette(uint start, uint colors, const byte *palData) {}
protected: protected:
const Graphics::PixelFormat _format;
virtual void updateTexture(); virtual void updateTexture();
Common::Rect getDirtyArea() const; Common::Rect getDirtyArea() const;
private: private:
const Graphics::PixelFormat _format;
GLTexture _glTexture; GLTexture _glTexture;
Graphics::Surface _textureData; Graphics::Surface _textureData;