mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 05:45:37 +00:00
Remove adreno fix, it only makes the crash less likely
This commit is contained in:
parent
a98475c863
commit
4a27a14d08
@ -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 =
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user