Skip to content

D
deprecated-irrlicht-mac
Commit d542ddaa authored by hybrid's avatar hybrid
Browse files
Options

Return 0 screenshot where targets are unsupported. D3D now supports automatic... 

Return 0 screenshot where targets are unsupported. D3D now supports automatic conversion to all basic color formats.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3753 dfc29bdd-3216-0410-991c-e03cc46cb475
parent cae05e6a
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 55 deletions
source/Irrlicht/CD3D8Driver.cpp
View file @ d542ddaa
......@@ -2242,13 +2242,18 @@ IImage* CD3D8Driver::createScreenShot(video::ECOLOR_FORMAT format, video::E_REND
#if defined( _IRR_XBOX_PLATFORM_)
return 0;
#else
HRESULT hr;
if (target != video::ERT_FRAME_BUFFER)
return 0;
// query the screen dimensions of the current adapter
D3DDISPLAYMODE displayMode;
pID3DDevice->GetDisplayMode(&displayMode);
if (format==video::ECF_UNKNOWN)
format=video::ECF_A8R8G8B8;
// create the image surface to store the front buffer image [always A8R8G8B8]
HRESULT hr;
LPDIRECT3DSURFACE8 lpSurface;
if (FAILED(hr = pID3DDevice->CreateImageSurface(displayMode.Width, displayMode.Height, D3DFMT_A8R8G8B8, &lpSurface)))
return 0;
......@@ -2293,41 +2298,42 @@ IImage* CD3D8Driver::createScreenShot(video::ECOLOR_FORMAT format, video::E_REND
shotSize.Height = core::min_( ScreenSize.Height, (u32)(clientRect.bottom-clientRect.top) );
// this could throw, but we aren't going to worry about that case very much
IImage* newImage = createImage(ECF_A8R8G8B8, shotSize);
// d3d pads the image, so we need to copy the correct number of bytes
u32* dP = (u32*)newImage->lock();
u8 * sP = (u8 *)lockedRect.pBits;
IImage* newImage = createImage(format, shotSize);
// If the display mode format doesn't promise anything about the Alpha value
// and it appears that it's not presenting 255, then we should manually
// set each pixel alpha value to 255.
if(D3DFMT_X8R8G8B8 == displayMode.Format && (0xFF000000 != (*dP & 0xFF000000)))
if (newImage)
{
for (u32 y = 0; y < shotSize.Height; ++y)
// d3d pads the image, so we need to copy the correct number of bytes
u32* dP = (u32*)newImage->lock();
u8 * sP = (u8 *)lockedRect.pBits;
// If the display mode format doesn't promise anything about the Alpha value
// and it appears that it's not presenting 255, then we should manually
// set each pixel alpha value to 255.
if(D3DFMT_X8R8G8B8 == displayMode.Format && (0xFF000000 != (*dP & 0xFF000000)))
{
for(u32 x = 0; x < shotSize.Width; ++x)
for (u32 y = 0; y < shotSize.Height; ++y)
{
*dP = *((u32*)sP) | 0xFF000000;
dP++;
sP += 4;
}
for(u32 x = 0; x < shotSize.Width; ++x)
{
newImage->setPixel(x,y,*((u32*)sP) | 0xFF000000);
sP += 4;
}
sP += lockedRect.Pitch - (4 * shotSize.Width);
sP += lockedRect.Pitch - (4 * shotSize.Width);
}
}
}
else
{
for (u32 y = 0; y < shotSize.Height; ++y)
else
{
memcpy(dP, sP, shotSize.Width * 4);
sP += lockedRect.Pitch;
dP += shotSize.Width;
for (u32 y = 0; y < shotSize.Height; ++y)
{
convertColor(sP, video::ECF_A8R8G8B8, shotSize.Width, dP, format);
sP += lockedRect.Pitch;
dP += shotSize.Width;
}
}
}
newImage->unlock();
newImage->unlock();
}
// we can unlock and release the surface
lpSurface->UnlockRect();
......
source/Irrlicht/CD3D9Driver.cpp
View file @ d542ddaa
......@@ -3161,13 +3161,18 @@ void CD3D9Driver::clearZBuffer()
//! Returns an image created from the last rendered frame.
IImage* CD3D9Driver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RENDER_TARGET target)
{
HRESULT hr;
if (target != video::ERT_FRAME_BUFFER)
return 0;
// query the screen dimensions of the current adapter
D3DDISPLAYMODE displayMode;
pID3DDevice->GetDisplayMode(0, &displayMode);
if (format==video::ECF_UNKNOWN)
format=video::ECF_A8R8G8B8;
// create the image surface to store the front buffer image [always A8R8G8B8]
HRESULT hr;
LPDIRECT3DSURFACE9 lpSurface;
if (FAILED(hr = pID3DDevice->CreateOffscreenPlainSurface(displayMode.Width, displayMode.Height, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &lpSurface, 0)))
return 0;
......@@ -3212,41 +3217,42 @@ IImage* CD3D9Driver::createScreenShot(video::ECOLOR_FORMAT format, video::E_REND
shotSize.Height = core::min_( ScreenSize.Height, (u32)(clientRect.bottom-clientRect.top) );
// this could throw, but we aren't going to worry about that case very much
IImage* newImage = createImage(ECF_A8R8G8B8, shotSize);
// d3d pads the image, so we need to copy the correct number of bytes
u32* dP = (u32*)newImage->lock();
u8 * sP = (u8 *)lockedRect.pBits;
IImage* newImage = createImage(format, shotSize);
// If the display mode format doesn't promise anything about the Alpha value
// and it appears that it's not presenting 255, then we should manually
// set each pixel alpha value to 255.
if(D3DFMT_X8R8G8B8 == displayMode.Format && (0xFF000000 != (*dP & 0xFF000000)))
if (newImage)
{
for (u32 y = 0; y < shotSize.Height; ++y)
// d3d pads the image, so we need to copy the correct number of bytes
u32* dP = (u32*)newImage->lock();
u8 * sP = (u8 *)lockedRect.pBits;
// If the display mode format doesn't promise anything about the Alpha value
// and it appears that it's not presenting 255, then we should manually
// set each pixel alpha value to 255.
if (D3DFMT_X8R8G8B8 == displayMode.Format && (0xFF000000 != (*dP & 0xFF000000)))
{
for(u32 x = 0; x < shotSize.Width; ++x)
for (u32 y = 0; y < shotSize.Height; ++y)
{
*dP = *((u32*)sP) | 0xFF000000;
dP++;
sP += 4;
}
for (u32 x = 0; x < shotSize.Width; ++x)
{
newImage->setPixel(x,y,*((u32*)sP) | 0xFF000000);
sP += 4;
}
sP += lockedRect.Pitch - (4 * shotSize.Width);
sP += lockedRect.Pitch - (4 * shotSize.Width);
}
}
}
else
{
for (u32 y = 0; y < shotSize.Height; ++y)
else
{
memcpy(dP, sP, shotSize.Width * 4);
sP += lockedRect.Pitch;
dP += shotSize.Width;
for (u32 y = 0; y < shotSize.Height; ++y)
{
convertColor(sP, video::ECF_A8R8G8B8, shotSize.Width, dP, format);
sP += lockedRect.Pitch;
dP += shotSize.Width;
}
}
}
newImage->unlock();
newImage->unlock();
}
// we can unlock and release the surface
lpSurface->UnlockRect();
......
source/Irrlicht/CSoftwareDriver.cpp
View file @ d542ddaa
......@@ -923,6 +923,9 @@ void CSoftwareDriver::clearZBuffer()
//! Returns an image created from the last rendered frame.
IImage* CSoftwareDriver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RENDER_TARGET target)
{
if (target != video::ERT_FRAME_BUFFER)
return 0;
if (BackBuffer)
{
IImage* tmp = createImage(BackBuffer->getColorFormat(), BackBuffer->getDimension());
......
source/Irrlicht/CSoftwareDriver2.cpp
View file @ d542ddaa
......@@ -2586,6 +2586,9 @@ void CBurningVideoDriver::clearZBuffer()
//! Returns an image created from the last rendered frame.
IImage* CBurningVideoDriver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RENDER_TARGET target)
{
if (target != video::ERT_FRAME_BUFFER)
return 0;
if (BackBuffer)
{
IImage* tmp = createImage(BackBuffer->getColorFormat(), BackBuffer->getDimension());
......@@ -2594,7 +2597,6 @@ IImage* CBurningVideoDriver::createScreenShot(video::ECOLOR_FORMAT format, video
}
else
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment