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

Remove adreno fix, it only makes the crash less likely

Browse Source
This commit is contained in:
Benoit Girard 2012-02-14 13:16:18 -05:00
parent 742c45674a
commit 9a725569b5
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/thebes/gfxSharedImageSurface.cpp
View File

@ -80,13 +80,7 @@ gfxSharedImageSurface::gfxSharedImageSurface(const gfxIntSize& aSize,
mSize = aSize;
mFormat = aFormat;
int w = aSize.width;
int h = aSize.height;
if ((aSize.width%MOZ_IMG_MEM_ALIGN) != 0)
w = aSize.width + MOZ_IMG_MEM_ALIGN - (aSize.width%MOZ_IMG_MEM_ALIGN);
mStride = ComputeStride(gfxIntSize(w, h), aFormat);
mStride = ComputeStride(aSize, aFormat);
mShmem = aShmem;
mData = aShmem.get<unsigned char>();
cairo_surface_t *surface =

16
gfx/thebes/gfxSharedImageSurface.h
View File

@ -39,14 +39,6 @@
#ifndef GFX_SHARED_IMAGESURFACE_H
#define GFX_SHARED_IMAGESURFACE_H
#if ANDROID
// Using an 64 align prevents us from crashing in driver
// code when doing RGB565 uploads. See bug 721489
#define MOZ_IMG_MEM_ALIGN 64
#else
#define MOZ_IMG_MEM_ALIGN 1
#endif
#include "mozilla/ipc/Shmem.h"
#include "mozilla/ipc/SharedMemory.h"
@ -122,14 +114,6 @@ private:
Shmem shmem;
long stride = ComputeStride(aSize, aFormat);
size_t size = GetAlignedSize(aSize, stride);
int w = aSize.width;
int h = aSize.height;
if ((aSize.width%MOZ_IMG_MEM_ALIGN) != 0)
w = aSize.width + MOZ_IMG_MEM_ALIGN - (aSize.width%MOZ_IMG_MEM_ALIGN);
stride = ComputeStride(gfxIntSize(w, h), aFormat);
size = GetAlignedSize(aSize, stride);
if (!Unsafe) {
if (!aAllocator->AllocShmem(size, aShmType, &shmem))
return nsnull;