mozilla
/
moz-skia
зеркало из https://github.com/mozilla/moz-skia.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix GL attach/detach in Mac SampleApp 

Review URL: http://codereview.appspot.com/5984043/


git-svn-id: http://skia.googlecode.com/svn/trunk@3587 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2012-04-03 18:03:03 +00:00
Родитель 86bb9b73a0
Коммит 5f017a4ab0
12 изменённых файлов: 137 добавлений и 90 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
include/views/SkOSWindow_Mac.h
Просмотреть файл

@ -19,14 +19,13 @@ public:
virtual bool onDispatchClick(int x, int y, Click::State state,
void* owner);
enum SkBackEndTypes {
kNone_BackEndType,
kNativeGL_BackEndType,
};
void detach();
bool attach(SkBackEndTypes attachType);
bool attach(SkBackEndTypes attachType, int msaaSampleCount);
void present();
protected:

2
include/views/SkOSWindow_Unix.h
Просмотреть файл

@ -40,7 +40,7 @@ public:
kNativeGL_BackEndType,
};
bool attach(SkBackEndTypes attachType);
bool attach(SkBackEndTypes attachType, int msaaSampleCount);
void detach();
void present();

6
include/views/SkOSWindow_Win.h
Просмотреть файл

@ -36,7 +36,7 @@ public:
kD3D9_BackEndType
};
bool attach(SkBackEndTypes attachType);
bool attach(SkBackEndTypes attachType, int msaaSampleCount);
void detach();
void present();
@ -78,13 +78,13 @@ private:
SkBackEndTypes fAttached;
bool attachGL();
bool attachGL(int msaaSampleCount);
void detachGL();
void presentGL();
#if SK_ANGLE
bool attachANGLE();
void detachANGLE();
void detachANGLE(int msaaSampleCount);
void presentANGLE();
#endif

21
samplecode/SampleApp.cpp
Просмотреть файл

@ -139,7 +139,8 @@ public:
: fCurContext(NULL)
, fCurIntf(NULL)
, fCurRenderTarget(NULL)
, fBackend(kNone_BackEndType) {
, fBackend(kNone_BackEndType)
, fMSAASampleCount(0) {
}
virtual ~DefaultDeviceManager() {
@ -148,7 +149,7 @@ public:
SkSafeUnref(fCurRenderTarget);
}
virtual void setUpBackend(SampleWindow* win) {
virtual void setUpBackend(SampleWindow* win, int msaaSampleCount) {
SkASSERT(kNone_BackEndType == fBackend);
fBackend = kNone_BackEndType;
@ -175,11 +176,12 @@ public:
break;
}
bool result = win->attach(fBackend);
bool result = win->attach(fBackend, msaaSampleCount);
if (!result) {
SkDebugf("Failed to initialize GL");
return;
}
fMSAASampleCount = msaaSampleCount;
SkASSERT(NULL == fCurIntf);
switch (win->getDeviceType()) {
@ -287,7 +289,7 @@ public:
virtual void windowSizeChanged(SampleWindow* win) {
if (fCurContext) {
win->attach(fBackend);
win->attach(fBackend, fMSAASampleCount);
GrPlatformRenderTargetDesc desc;
desc.fWidth = SkScalarRound(win->width());
@ -313,6 +315,7 @@ private:
GrRenderTarget* fCurRenderTarget;
SkOSWindow::SkBackEndTypes fBackend;
int fMSAASampleCount;
typedef SampleWindow::DeviceManager INHERITED;
};
@ -645,9 +648,10 @@ static inline SampleWindow::DeviceType cycle_devicetype(SampleWindow::DeviceType
}
static void usage(const char * argv0) {
SkDebugf("%s [--slide sampleName] [-i resourcePath]\n", argv0);
SkDebugf("%s [--slide sampleName] [-i resourcePath] [-msaa=<samplecnt>]\n", argv0);
SkDebugf(" sampleName: sample at which to start.\n");
SkDebugf(" resourcePath: directory that stores image resources.\n");
SkDebugf(" msaa: request multisampling with the given sample count.\n");
}
SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* devManager) : INHERITED(hwnd) {
@ -663,6 +667,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
const char* resourcePath = NULL;
fCurrIndex = -1;
fMSAASampleCount = 0;
const char* const commandName = argv[0];
char* const* stop = argv + argc;
@ -680,6 +685,8 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
fprintf(stderr, "Unknown sample \"%s\"\n", *argv);
}
}
} else if (1 == sscanf(*argv, "--msaa=%d", &fMSAASampleCount) &&
fMSAASampleCount >= 0) {
}
else {
usage(commandName);
@ -820,7 +827,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
devManager->ref();
fDevManager = devManager;
}
fDevManager->setUpBackend(this);
fDevManager->setUpBackend(this, fMSAASampleCount);
// If another constructor set our dimensions, ensure that our
// onSizeChange gets called.
@ -1671,7 +1678,7 @@ void SampleWindow::setDeviceType(DeviceType type) {
fDeviceType = type;
fDevManager->setUpBackend(this);
fDevManager->setUpBackend(this, fMSAASampleCount);
this->updateTitle();
this->inval(NULL);

4
samplecode/SampleApp.h
Просмотреть файл

@ -50,7 +50,7 @@ public:
*/
class DeviceManager : public SkRefCnt {
public:
virtual void setUpBackend(SampleWindow* win) = 0;
virtual void setUpBackend(SampleWindow* win, int msaaSampleCount) = 0;
virtual void tearDownBackend(SampleWindow* win) = 0;
@ -170,6 +170,8 @@ private:
SkOSMenu::TriState fHintingState;
unsigned fFlipAxis;
int fMSAASampleCount;
int fScrollTestX, fScrollTestY;
SkScalar fZoomCenterX, fZoomCenterY;

11
src/gpu/GrContext.cpp
Просмотреть файл

@ -22,11 +22,11 @@
#include "SkTLazy.h"
#include "SkTrace.h"
#define DEFER_TEXT_RENDERING 1
#define DEFER_TEXT_RENDERING 0
#define DEFER_PATHS 1
#define DEFER_PATHS 0
#define BATCH_RECT_TO_RECT (1 && !GR_STATIC_RECT_VB)
#define BATCH_RECT_TO_RECT (0 && !GR_STATIC_RECT_VB)
#define MAX_BLUR_SIGMA 4.0f
@ -2056,7 +2056,6 @@ void GrContext::setupDrawBuffer() {
GrAssert(NULL == fDrawBufferVBAllocPool);
GrAssert(NULL == fDrawBufferIBAllocPool);
#if DEFER_TEXT_RENDERING || BATCH_RECT_TO_RECT
fDrawBufferVBAllocPool =
new GrVertexBufferAllocPool(fGpu, false,
DRAW_BUFFER_VBPOOL_BUFFER_SIZE,
@ -2069,11 +2068,7 @@ void GrContext::setupDrawBuffer() {
fDrawBuffer = new GrInOrderDrawBuffer(fGpu,
fDrawBufferVBAllocPool,
fDrawBufferIBAllocPool);
#endif
#if BATCH_RECT_TO_RECT
fDrawBuffer->setQuadIndexBuffer(this->getQuadIndexBuffer());
#endif
fDrawBuffer->setAutoFlushTarget(fGpu);
fDrawBuffer->setDrawState(fDrawState);
}

8
src/gpu/gl/GrGpuGL.cpp
Просмотреть файл

@ -1848,6 +1848,7 @@ void GrGpuGL::flushAAState(GrPrimitiveType type) {
// we prefer smooth lines over multisampled lines
// msaa should be disabled if drawing smooth lines.
bool handledMSAA = false;
if (GrIsPrimTypeLines(type)) {
bool smooth = this->willUseHWAALines();
if (!fHWAAState.fSmoothLineEnabled && smooth) {
@ -1857,12 +1858,13 @@ void GrGpuGL::flushAAState(GrPrimitiveType type) {
GL_CALL(Disable(GR_GL_LINE_SMOOTH));
fHWAAState.fSmoothLineEnabled = false;
}
if (rt->isMultisampled() &&
fHWAAState.fMSAAEnabled) {
if (smooth && rt->isMultisampled() && fHWAAState.fMSAAEnabled) {
GL_CALL(Disable(GR_GL_MULTISAMPLE));
fHWAAState.fMSAAEnabled = false;
handledMSAA = true;
}
} else if (rt->isMultisampled() &&
}
if (!handledMSAA && rt->isMultisampled() &&
this->getDrawState().isHWAntialiasState() !=
fHWAAState.fMSAAEnabled) {
if (fHWAAState.fMSAAEnabled) {

2
src/views/mac/SkNSView.h
Просмотреть файл

@ -42,7 +42,7 @@ class SkEvent;
- (void)postInvalWithRect:(const SkIRect*)rectOrNil;
- (BOOL)onHandleEvent:(const SkEvent&)event;
- (bool)attach:(SkOSWindow::SkBackEndTypes)attachType;
- (bool)attach:(SkOSWindow::SkBackEndTypes)attachType withMSAASampleCount:(int) sampleCount;
- (void)detach;
- (void)present;
@end

40
src/views/mac/SkNSView.mm
Просмотреть файл

@ -225,25 +225,36 @@ static SkKey raw2key(UInt32 raw)
///////////////////////////////////////////////////////////////////////////////
#include <OpenGL/OpenGL.h>
CGLContextObj createGLContext() {
namespace {
CGLContextObj createGLContext(int msaaSampleCount) {
GLint major, minor;
CGLGetVersion(&major, &minor);
const CGLPixelFormatAttribute attributes[] = {
static const CGLPixelFormatAttribute attributes[] = {
kCGLPFAStencilSize, (CGLPixelFormatAttribute)8,
#if USE_MSAA
kCGLPFASampleBuffers, 1,
kCGLPFAMultisample,
kCGLPFASamples, 8,
#endif
kCGLPFAAccelerated,
kCGLPFADoubleBuffer,
(CGLPixelFormatAttribute)0
};
CGLPixelFormatObj format;
GLint npix;
GLint npix = 0;
if (msaaSampleCount > 0) {
static int kAttributeCount = SK_ARRAY_COUNT(attributes);
CGLPixelFormatAttribute msaaAttributes[kAttributeCount + 5];
memcpy(msaaAttributes, attributes, sizeof(attributes));
SkASSERT(0 == msaaAttributes[kAttributeCount - 1]);
msaaAttributes[kAttributeCount - 1] = kCGLPFASampleBuffers;
msaaAttributes[kAttributeCount + 0] = (CGLPixelFormatAttribute)1;
msaaAttributes[kAttributeCount + 1] = kCGLPFAMultisample;
msaaAttributes[kAttributeCount + 2] = kCGLPFASamples;
msaaAttributes[kAttributeCount + 3] = (CGLPixelFormatAttribute)msaaSampleCount;
msaaAttributes[kAttributeCount + 4] = (CGLPixelFormatAttribute)0;
CGLChoosePixelFormat(msaaAttributes, &format, &npix);
}
if (!npix) {
CGLChoosePixelFormat(attributes, &format, &npix);
}
CGLContextObj ctx;
CGLCreateContext(format, NULL, &ctx);
@ -254,6 +265,7 @@ CGLContextObj createGLContext() {
CGLSetCurrentContext(ctx);
return ctx;
}
}
- (void)viewDidMoveToWindow {
[super viewDidMoveToWindow];
@ -265,12 +277,15 @@ CGLContextObj createGLContext() {
[fGLContext setView:self];
}
}
- (bool)attach:(SkOSWindow::SkBackEndTypes)attachType {
- (bool)attach:(SkOSWindow::SkBackEndTypes)attachType withMSAASampleCount:(int) sampleCount {
if (nil == fGLContext) {
fGLContext = [[NSOpenGLContext alloc] initWithCGLContextObj:createGLContext()];
CGLContextObj ctx = createGLContext(sampleCount);
fGLContext = [[NSOpenGLContext alloc] initWithCGLContextObj:ctx];
CGLReleaseContext(ctx);
if (NULL == fGLContext) {
return false;
}
[fGLContext setView:self];
}
[fGLContext makeCurrentContext];
@ -283,10 +298,13 @@ CGLContextObj createGLContext() {
}
- (void)detach {
[fGLContext clearDrawable];
[fGLContext release];
fGLContext = nil;
}
- (void)present {
if (nil != fGLContext) {
[fGLContext flushBuffer];
}
}
@end

4
src/views/mac/SkOSWindow_Mac.mm
Просмотреть файл

@ -63,8 +63,8 @@ void SkOSWindow::onUpdateMenu(const SkOSMenu* menu) {
[(SkNSView*)fHWND onUpdateMenu:menu];
}
bool SkOSWindow::attach(SkBackEndTypes attachType) {
return [(SkNSView*)fHWND attach:attachType];
bool SkOSWindow::attach(SkBackEndTypes attachType, int sampleCount) {
return [(SkNSView*)fHWND attach:attachType withMSAASampleCount:sampleCount];
}
void SkOSWindow::detach() {

2
src/views/unix/SkOSWindow_Unix.cpp
Просмотреть файл

@ -170,7 +170,7 @@ void SkOSWindow::mapWindowAndWait()
}
bool SkOSWindow::attach(SkBackEndTypes /* attachType */)
bool SkOSWindow::attach(SkBackEndTypes /* attachType */, int msaaSampleCount)
{
if (fGLAttached) return true;
Display* dsp = fUnixWindow.fDisplay;

86
src/views/win/SkOSWindow_win.cpp
Просмотреть файл

@ -313,7 +313,7 @@ void SkEvent::SignalQueueTimer(SkMSec delay)
#define USE_MSAA 0
HGLRC create_gl(HWND hwnd) {
HGLRC create_gl(HWND hwnd, int msaaSampleCount) {
HDC dc = GetDC(hwnd);
@ -328,7 +328,7 @@ HGLRC create_gl(HWND hwnd) {
int format = 0;
GLint iattrs[] = {
static const GLint iAttrs[] = {
SK_WGL_DRAW_TO_WINDOW, TRUE,
SK_WGL_DOUBLE_BUFFER, TRUE,
SK_WGL_ACCELERATION, SK_WGL_FULL_ACCELERATION,
@ -336,23 +336,27 @@ HGLRC create_gl(HWND hwnd) {
SK_WGL_COLOR_BITS, 24,
SK_WGL_ALPHA_BITS, 8,
SK_WGL_STENCIL_BITS, 8,
// these must be kept last
SK_WGL_SAMPLE_BUFFERS, TRUE,
SK_WGL_SAMPLES, 0,
0,0
0, 0
};
static const int kSampleBuffersValueIdx = SK_ARRAY_COUNT(iattrs) - 5;
static const int kSamplesValueIdx = SK_ARRAY_COUNT(iattrs) - 3;
if (USE_MSAA && extensions.hasExtension(dc, "WGL_ARB_multisample")) {
for (int samples = 16; samples > 1; --samples) {
GLfloat fAttrs[] = {0, 0};
iattrs[kSamplesValueIdx] = samples;
GLfloat fattrs[] = {0,0};
if (msaaSampleCount > 0 &&
extensions.hasExtension(dc, "WGL_ARB_multisample")) {
static const int kIAttrsCount = SK_ARRAY_COUNT(iAttrs);
GLint msaaIAttrs[kIAttrsCount + 4];
memcpy(msaaIAttrs, iAttrs, sizeof(GLint) * kIAttrsCount);
SkASSERT(0 == msaaIAttrs[kIAttrsCount - 2] &&
0 == msaaIAttrs[kIAttrsCount - 1]);
msaaIAttrs[kIAttrsCount - 2] = SK_WGL_SAMPLE_BUFFERS;
msaaIAttrs[kIAttrsCount - 1] = TRUE;
msaaIAttrs[kIAttrsCount + 0] = SK_WGL_SAMPLES;
msaaIAttrs[kIAttrsCount + 1] = msaaSampleCount;
msaaIAttrs[kIAttrsCount + 2] = 0;
msaaIAttrs[kIAttrsCount + 3] = 0;
GLuint num;
int formats[64];
extensions.choosePixelFormat(dc, iattrs, fattrs, 64, formats, &num);
extensions.choosePixelFormat(dc, msaaIAttrs, fAttrs, 64, formats, &num);
num = min(num,64);
for (GLuint i = 0; i < num; ++i) {
DescribePixelFormat(dc, formats[i], sizeof(pfd), &pfd);
@ -362,14 +366,10 @@ HGLRC create_gl(HWND hwnd) {
}
}
}
}
if (0 == format) {
iattrs[kSampleBuffersValueIdx-1] = iattrs[kSampleBuffersValueIdx] = 0;
iattrs[kSamplesValueIdx-1] = iattrs[kSamplesValueIdx] = 0;
GLfloat fattrs[] = {0,0};
GLuint num;
extensions.choosePixelFormat(dc, iattrs, fattrs, 1, &format, &num);
extensions.choosePixelFormat(dc, iAttrs, fAttrs, 1, &format, &num);
DescribePixelFormat(dc, format, sizeof(pfd), &pfd);
BOOL set = SetPixelFormat(dc, format, &pfd);
SkASSERT(TRUE == set);
@ -382,9 +382,9 @@ HGLRC create_gl(HWND hwnd) {
return glrc;
}
bool SkOSWindow::attachGL() {
bool SkOSWindow::attachGL(int msaaSampleCount) {
if (NULL == fHGLRC) {
fHGLRC = create_gl((HWND)fHWND);
fHGLRC = create_gl((HWND)fHWND, msaaSampleCount);
if (NULL == fHGLRC) {
return false;
}
@ -413,13 +413,15 @@ void SkOSWindow::presentGL() {
}
#if SK_ANGLE
bool create_ANGLE(EGLNativeWindowType hWnd, EGLDisplay* eglDisplay,
EGLContext* eglContext, EGLSurface* eglSurface) {
EGLint contextAttribs[] = {
EGL_CONTEXT_CLIENT_VERSION, 2,
bool create_ANGLE(EGLNativeWindowType hWnd,
int msaaSampleCount,
angle::EGLDisplay* eglDisplay,
angle::EGLContext* eglContext,
angle::EGLSurface* eglSurface) {
static EGLint contextAttribs[] = {
EGL_NONE, EGL_NONE
};
EGLint configAttribList[] = {
static EGLint configAttribList[] = {
EGL_RED_SIZE, 8,
EGL_GREEN_SIZE, 8,
EGL_BLUE_SIZE, 8,
@ -428,7 +430,7 @@ bool create_ANGLE(EGLNativeWindowType hWnd, EGLDisplay* eglDisplay,
EGL_STENCIL_SIZE, 8,
EGL_NONE
};
EGLint surfaceAttribList[] = {
static EGLint surfaceAttribList[] = {
EGL_NONE, EGL_NONE
};
@ -450,10 +452,32 @@ bool create_ANGLE(EGLNativeWindowType hWnd, EGLDisplay* eglDisplay,
// Choose config
EGLConfig config;
bool foundConfig = false;
if (msaaSampleCount) {
static int kConfigAttribListCnt = SK_ARRAY_COUNT(configAttribList);
EGLint msaaConfigAttribList[kConfigAttribListCnt + 4];
memcpy(msaaConfigAttribList,
configAttribList,
sizeof(configAttribList));
SkASSERT(EGL_NONE == msaaConfigAttribList[kConfigAttribListCnt - 1]);
msaaConfigAttribList[kConfigAttribListCnt - 1] = EGL_SAMPLE_BUFFERS;
msaaConfigAttribList[kConfigAttribListCnt + 0] = 1;
msaaConfigAttribList[kConfigAttribListCnt + 1] = EGL_SAMPLES;
msaaConfigAttribList[kConfigAttribListCnt + 2] = msaaCount;
msaaConfigAttribList[kConfigAttribListCnt + 3] = EGL_NONE;
if (eglChooseConfig(display, configAttribList,
&config, 1, &numConfigs)) {
if (numConfigs > 0) {
foundConfig = true;
}
}
}
if (!foundConfig) {
if (!eglChooseConfig(display, configAttribList,
&config, 1, &numConfigs)) {
return false;
}
}
// Create a surface
EGLSurface surface = eglCreateWindowSurface(display, config,
@ -482,7 +506,7 @@ bool create_ANGLE(EGLNativeWindowType hWnd, EGLDisplay* eglDisplay,
return true;
}
bool SkOSWindow::attachANGLE() {
bool SkOSWindow::attachANGLE(int msaaSampleCount) {
if (EGL_NO_DISPLAY == fDisplay) {
bool bResult = create_ANGLE((HWND)fHWND, &fDisplay, &fContext, &fSurface);
if (false == bResult) {
@ -640,7 +664,7 @@ void SkOSWindow::presentD3D9() {
}
// return true on success
bool SkOSWindow::attach(SkBackEndTypes attachType) {
bool SkOSWindow::attach(SkBackEndTypes attachType, int msaaSampleCount) {
// attach doubles as "windowResize" so we need to allo
// already bound states to pass through again
@ -653,11 +677,11 @@ bool SkOSWindow::attach(SkBackEndTypes attachType) {
// nothing to do
break;
case kNativeGL_BackEndType:
result = attachGL();
result = attachGL(msaaSampleCount);
break;
#if SK_ANGLE
case kANGLE_BackEndType:
result = attachANGLE();
result = attachANGLE(msaaSampleCount);
break;
#endif
case kD3D9_BackEndType: