diff options
| author | Joost Peters | 2009-02-18 13:28:52 +0000 |
|---|---|---|
| committer | Joost Peters | 2009-02-18 13:28:52 +0000 |
| commit | 22340b6c3d7f1376e33e5315ad0554a9a99333a5 (patch) | |
| tree | 6566d7d9fb3da2d0f6962c1aabe52f223330bbdf | |
| parent | b9d3c752b16f9239fccac2f9c9474245f12fce10 (diff) | |
| download | scummvm-rg350-22340b6c3d7f1376e33e5315ad0554a9a99333a5.tar.gz scummvm-rg350-22340b6c3d7f1376e33e5315ad0554a9a99333a5.tar.bz2 scummvm-rg350-22340b6c3d7f1376e33e5315ad0554a9a99333a5.zip | |
Use 4444 overlay on PSP (instead of 1555).
svn-id: r38475
| -rw-r--r-- | backends/platform/psp/osys_psp.h | 2 | ||||
| -rw-r--r-- | backends/platform/psp/osys_psp_gu.cpp | 13 | ||||
| -rw-r--r-- | graphics/colormasks.h | 7 |
3 files changed, 17 insertions, 5 deletions
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 50a5572142..acd98c6b74 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -109,7 +109,7 @@ public: virtual int16 getOverlayHeight(); virtual int16 getOverlayWidth(); virtual void grabPalette(byte *colors, uint start, uint num); - virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<1555>(); } + virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<4444>(); } virtual bool showMouse(bool visible); diff --git a/backends/platform/psp/osys_psp_gu.cpp b/backends/platform/psp/osys_psp_gu.cpp index a388ef55fe..8cae6d5f39 100644 --- a/backends/platform/psp/osys_psp_gu.cpp +++ b/backends/platform/psp/osys_psp_gu.cpp @@ -333,15 +333,19 @@ void OSystem_PSP_GU::updateScreen() { vertices[1].x = PSP_SCREEN_WIDTH; vertices[1].y = PSP_SCREEN_HEIGHT; vertices[1].z = 0; vertices[0].u = 0.5; vertices[0].v = 0.5; vertices[1].u = _overlayWidth - 0.5; vertices[1].v = _overlayHeight - 0.5; - sceGuTexMode(GU_PSM_5551, 0, 0, 0); // 16-bit image - sceGuAlphaFunc(GU_GREATER, 0, 0xff); - sceGuEnable(GU_ALPHA_TEST); + sceGuTexMode(GU_PSM_4444, 0, 0, 0); // 16-bit image + sceGuDisable(GU_ALPHA_TEST); + sceGuEnable(GU_BLEND); + + //sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_ONE_MINUS_SRC_ALPHA, 0, 0); + sceGuBlendFunc(GU_ADD, GU_FIX, GU_ONE_MINUS_SRC_ALPHA, 0xFFFFFFFF, 0); + if (_overlayWidth > 320) sceGuTexImage(0, 512, 512, _overlayWidth, _overlayBuffer); else sceGuTexImage(0, 512, 256, _overlayWidth, _overlayBuffer); - sceGuTexFunc(GU_TFX_MODULATE, GU_TCC_RGBA); + sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA); sceGuDrawArray(GU_SPRITES,GU_TEXTURE_32BITF|GU_VERTEX_32BITF|GU_TRANSFORM_2D,2,0,vertices); // need to render twice for textures > 512 if ( _overlayWidth > 512) { @@ -350,6 +354,7 @@ void OSystem_PSP_GU::updateScreen() { vertices[0].x = PSP_SCREEN_WIDTH * 512 / 640; vertices[0].y = 0; vertices[0].z = 0; sceGuDrawArray(GU_SPRITES, GU_TEXTURE_32BITF|GU_VERTEX_32BITF|GU_TRANSFORM_2D, 2, 0, vertices); } + sceGuDisable(GU_BLEND); } // draw mouse diff --git a/graphics/colormasks.h b/graphics/colormasks.h index c7763add11..3b5a84a03e 100644 --- a/graphics/colormasks.h +++ b/graphics/colormasks.h @@ -169,10 +169,17 @@ struct ColorMasks<4444> { kGreenBits = 4, kBlueBits = 4, +#ifdef __PSP__ //PSP uses ABGR + kAlphaShift = kRedBits+kGreenBits+kBlueBits, + kRedShift = 0, + kGreenShift = kRedBits, + kBlueShift = kRedBits+kGreenBits, +#else //ARGB kAlphaShift = kRedBits+kGreenBits+kBlueBits, kRedShift = kGreenBits+kBlueBits, kGreenShift = kBlueBits, kBlueShift = 0, +#endif kAlphaMask = ((1 << kAlphaBits) - 1) << kAlphaShift, kRedMask = ((1 << kRedBits) - 1) << kRedShift, |