wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 938970 - 3/5. Some d3d tweaks needed to build with UNIFIED_SOURCES - r=Bas

Browse Source
This commit is contained in:
Benoit Jacob 2013-11-17 21:06:23 -05:00
parent cc5dec6997
commit ac3ababc4b
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/layers/d3d11/TextureD3D11.cpp
View File

@ -285,7 +285,7 @@ DeprecatedTextureHostShmemD3D11::GetTileRect()
return nsIntRect(rect.x, rect.y, rect.width, rect.height);
}
static uint32_t GetRequiredTiles(uint32_t aSize, uint32_t aMaxSize)
static uint32_t GetRequiredTilesD3D11(uint32_t aSize, uint32_t aMaxSize)
{
uint32_t requiredTiles = aSize / aMaxSize;
if (aSize % aMaxSize) {
@ -354,8 +354,8 @@ DeprecatedTextureHostShmemD3D11::UpdateImpl(const SurfaceDescriptor& aImage,
mIsTiled = false;
} else {
mIsTiled = true;
uint32_t tileCount = GetRequiredTiles(size.width, maxSize) *
GetRequiredTiles(size.height, maxSize);
uint32_t tileCount = GetRequiredTilesD3D11(size.width, maxSize) *
GetRequiredTilesD3D11(size.height, maxSize);
mTileTextures.resize(tileCount);
@ -380,8 +380,8 @@ IntRect
DeprecatedTextureHostShmemD3D11::GetTileRect(uint32_t aID) const
{
uint32_t maxSize = GetMaxTextureSizeForFeatureLevel(mDevice->GetFeatureLevel());
uint32_t horizontalTiles = GetRequiredTiles(mSize.width, maxSize);
uint32_t verticalTiles = GetRequiredTiles(mSize.height, maxSize);
uint32_t horizontalTiles = GetRequiredTilesD3D11(mSize.width, maxSize);
uint32_t verticalTiles = GetRequiredTilesD3D11(mSize.height, maxSize);
uint32_t verticalTile = aID / horizontalTiles;
uint32_t horizontalTile = aID % horizontalTiles;

5
gfx/layers/d3d9/LayerManagerD3D9.cpp
View File

@ -219,11 +219,6 @@ LayerManagerD3D9::CreateReadbackLayer()
return layer.forget();
}
void ReleaseTexture(void *texture)
{
static_cast<IDirect3DTexture9*>(texture)->Release();
}
void
LayerManagerD3D9::ReportFailure(const nsACString &aMsg, HRESULT aCode)
{

18
gfx/layers/d3d9/TextureD3D9.cpp
View File

@ -120,7 +120,7 @@ DeprecatedTextureHostD3D9::GetTileRect()
return nsIntRect(rect.x, rect.y, rect.width, rect.height);
}
static uint32_t GetRequiredTiles(uint32_t aSize, uint32_t aMaxSize)
static uint32_t GetRequiredTilesD3D9(uint32_t aSize, uint32_t aMaxSize)
{
uint32_t requiredTiles = aSize / aMaxSize;
if (aSize % aMaxSize) {
@ -292,8 +292,8 @@ DeprecatedTextureHostShmemD3D9::UpdateImpl(const SurfaceDescriptor& aImage,
mIsTiled = false;
} else {
mIsTiled = true;
uint32_t tileCount = GetRequiredTiles(size.width, maxSize) *
GetRequiredTiles(size.height, maxSize);
uint32_t tileCount = GetRequiredTilesD3D9(size.width, maxSize) *
GetRequiredTilesD3D9(size.height, maxSize);
mTileTextures.resize(tileCount);
for (uint32_t i = 0; i < tileCount; i++) {
@ -315,8 +315,8 @@ IntRect
DeprecatedTextureHostD3D9::GetTileRect(uint32_t aID) const
{
uint32_t maxSize = mCompositor->GetMaxTextureSize();
uint32_t horizontalTiles = GetRequiredTiles(mSize.width, maxSize);
uint32_t verticalTiles = GetRequiredTiles(mSize.height, maxSize);
uint32_t horizontalTiles = GetRequiredTilesD3D9(mSize.width, maxSize);
uint32_t verticalTiles = GetRequiredTilesD3D9(mSize.height, maxSize);
uint32_t verticalTile = aID / horizontalTiles;
uint32_t horizontalTile = aID % horizontalTiles;
@ -444,8 +444,8 @@ DeprecatedTextureHostSystemMemD3D9::UpdateImpl(const SurfaceDescriptor& aImage,
} else {
mIsTiled = true;
uint32_t tileCount = GetRequiredTiles(mSize.width, maxSize) *
GetRequiredTiles(mSize.height, maxSize);
uint32_t tileCount = GetRequiredTilesD3D9(mSize.width, maxSize) *
GetRequiredTilesD3D9(mSize.height, maxSize);
mTileTextures.resize(tileCount);
for (uint32_t i = 0; i < tileCount; i++) {
@ -557,8 +557,8 @@ DeprecatedTextureHostDIB::UpdateImpl(const SurfaceDescriptor& aImage,
} else {
mIsTiled = true;
uint32_t tileCount = GetRequiredTiles(mSize.width, maxSize) *
GetRequiredTiles(mSize.height, maxSize);
uint32_t tileCount = GetRequiredTilesD3D9(mSize.width, maxSize) *
GetRequiredTilesD3D9(mSize.height, maxSize);
mTileTextures.resize(tileCount);
for (uint32_t i = 0; i < tileCount; i++) {

5
gfx/thebes/gfxFailure.h
View File

@ -5,6 +5,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef gfxFailure_h_
#define gfxFailure_h_
#include "nsString.h"
#include "nsIGfxInfo.h"
#include "nsServiceManagerUtils.h"
@ -18,3 +21,5 @@ namespace mozilla {
}
}
}
#endif // gfxFailure_h_