48825b11ad
Old: 0 -> nonMSAA
1+ -> MSAA
New:
0 -> error/unsupported
1 -> nonMSAA
2+ -> MSAA
We still allow 0 to mean nonMSAA in three sets of public APIs for backwards compatibility:
1) SkSurface factories
2) GrBackendRenderTarget constructors
3) GrCaps::getSampleCnt()'s requestedCount parameter
However, we immediately clamp to 1 and treat 0 as invalid/non-renderable internally.
This also changes the behavior when using a large sample count. We now fail in that case rather than using the largest sample available sample count. GrCaps::getSampleCount() will return 0 in this case.
Bug: skia:
Change-Id: Ida22c6b22c1365e563c9046b611e88bf5eb3ff33
Reviewed-on: https://skia-review.googlesource.com/101560
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
97 lines
2.1 KiB
C++
97 lines
2.1 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef Window_unix_DEFINED
|
|
#define Window_unix_DEFINED
|
|
|
|
#include <X11/Xlib.h>
|
|
#include <GL/glx.h>
|
|
#include "../Window.h"
|
|
#include "SkChecksum.h"
|
|
#include "SkTDynamicHash.h"
|
|
|
|
typedef Window XWindow;
|
|
|
|
namespace sk_app {
|
|
|
|
class Window_unix : public Window {
|
|
public:
|
|
Window_unix()
|
|
: Window()
|
|
, fDisplay(nullptr)
|
|
, fWindow(0)
|
|
, fGC(nullptr)
|
|
, fFBConfig(nullptr)
|
|
, fVisualInfo(nullptr)
|
|
, fMSAASampleCount(1) {}
|
|
~Window_unix() override { this->closeWindow(); }
|
|
|
|
bool initWindow(Display* display);
|
|
|
|
void setTitle(const char*) override;
|
|
void show() override;
|
|
|
|
bool attach(BackendType) override;
|
|
|
|
void onInval() override;
|
|
|
|
bool handleEvent(const XEvent& event);
|
|
|
|
static const XWindow& GetKey(const Window_unix& w) {
|
|
return w.fWindow;
|
|
}
|
|
|
|
static uint32_t Hash(const XWindow& w) {
|
|
return SkChecksum::Mix(w);
|
|
}
|
|
|
|
static SkTDynamicHash<Window_unix, XWindow> gWindowMap;
|
|
|
|
void markPendingPaint() { fPendingPaint = true; }
|
|
void finishPaint() {
|
|
if (fPendingPaint) {
|
|
this->onPaint();
|
|
fPendingPaint = false;
|
|
}
|
|
}
|
|
|
|
void markPendingResize(int width, int height) {
|
|
if (width != this->width() || height != this->height()){
|
|
fPendingResize = true;
|
|
fPendingWidth = width;
|
|
fPendingHeight = height;
|
|
}
|
|
}
|
|
void finishResize() {
|
|
if (fPendingResize) {
|
|
this->onResize(fPendingWidth, fPendingHeight);
|
|
fPendingResize = false;
|
|
}
|
|
}
|
|
|
|
private:
|
|
void closeWindow();
|
|
|
|
Display* fDisplay;
|
|
XWindow fWindow;
|
|
GC fGC;
|
|
GLXFBConfig* fFBConfig;
|
|
XVisualInfo* fVisualInfo;
|
|
int fMSAASampleCount;
|
|
|
|
Atom fWmDeleteMessage;
|
|
|
|
bool fPendingPaint;
|
|
int fPendingWidth;
|
|
int fPendingHeight;
|
|
bool fPendingResize;
|
|
};
|
|
|
|
} // namespace sk_app
|
|
|
|
#endif
|