aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bench/benchmain.cpp2
-rw-r--r--debugger/QT/SkGLWidget.cpp2
-rw-r--r--gm/gmmain.cpp2
-rw-r--r--gm/texdata.cpp2
-rw-r--r--include/gpu/GrContext.h12
-rw-r--r--include/gpu/GrEffectUnitTest.h2
-rw-r--r--include/gpu/GrTypes.h21
-rw-r--r--samplecode/SampleApp.cpp4
-rw-r--r--src/gpu/GrAtlas.cpp2
-rw-r--r--src/gpu/SkGpuDevice.cpp6
-rw-r--r--src/gpu/SkGr.cpp2
-rw-r--r--src/gpu/SkGrPixelRef.cpp2
-rw-r--r--tests/ClipCacheTest.cpp4
-rw-r--r--tests/GLProgramsTest.cpp2
-rw-r--r--tests/ReadPixelsTest.cpp2
-rw-r--r--tests/WritePixelsTest.cpp2
16 files changed, 18 insertions, 51 deletions
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 370530df14..7b1a34e5bf 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -207,7 +207,7 @@ public:
grCtx = GrContext::Create(kOpenGL_GrBackend, ctx);
if (NULL != grCtx) {
GrBackendRenderTargetDesc desc;
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_GrPixelConfig;
desc.fWidth = width;
desc.fHeight = height;
desc.fStencilBits = 8;
diff --git a/debugger/QT/SkGLWidget.cpp b/debugger/QT/SkGLWidget.cpp
index 8b6e8572a2..6ab860ce45 100644
--- a/debugger/QT/SkGLWidget.cpp
+++ b/debugger/QT/SkGLWidget.cpp
@@ -63,7 +63,7 @@ GrBackendRenderTargetDesc SkGLWidget::getDesc(int w, int h) {
GrBackendRenderTargetDesc desc;
desc.fWidth = SkScalarRound(this->width());
desc.fHeight = SkScalarRound(this->height());
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_GrPixelConfig;
GR_GL_GetIntegerv(fCurIntf, GR_GL_SAMPLES, &desc.fSampleCnt);
GR_GL_GetIntegerv(fCurIntf, GR_GL_STENCIL_BITS, &desc.fStencilBits);
GrGLint buffer;
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index bbeb443d9f..da7b79e70b 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1503,7 +1503,7 @@ int tool_main(int argc, char** argv) {
if (gr) {
// create a render target to back the device
GrTextureDesc desc;
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_GrPixelConfig;
desc.fFlags = kRenderTarget_GrTextureFlagBit;
desc.fWidth = gm->getISize().width();
desc.fHeight = gm->getISize().height();
diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index da52aade6a..7d441199a2 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -84,7 +84,7 @@ protected:
// use RT flag bit because in GL it makes the texture be bottom-up
desc.fFlags = i ? kRenderTarget_GrTextureFlagBit :
kNone_GrTextureFlags;
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_GrPixelConfig;
desc.fWidth = 2 * S;
desc.fHeight = 2 * S;
GrTexture* texture =
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 3b5e9c4f0e..274d351149 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -16,8 +16,6 @@
#include "SkMatrix.h"
#include "GrPaint.h"
#include "GrPathRendererChain.h"
-// not strictly needed but requires WK change in LayerTextureUpdaterCanvas to
-// remove.
#include "GrRenderTarget.h"
#include "GrRefCnt.h"
#include "GrTexture.h"
@@ -842,16 +840,6 @@ public:
void printCacheStats() const;
#endif
- ///////////////////////////////////////////////////////////////////////////
- // Legacy names that will be kept until WebKit can be updated.
- GrTexture* createPlatformTexture(const GrPlatformTextureDesc& desc) {
- return this->wrapBackendTexture(desc);
- }
-
- GrRenderTarget* createPlatformRenderTarget(const GrPlatformRenderTargetDesc& desc) {
- return wrapBackendRenderTarget(desc);
- }
-
private:
// Used to indicate whether a draw should be performed immediately or queued in fDrawBuffer.
enum BufferedDraw {
diff --git a/include/gpu/GrEffectUnitTest.h b/include/gpu/GrEffectUnitTest.h
index 8b65e97235..3d251e21a7 100644
--- a/include/gpu/GrEffectUnitTest.h
+++ b/include/gpu/GrEffectUnitTest.h
@@ -68,7 +68,7 @@ private:
* also implement this static function:
* GrEffect* TestCreate(SkRandom*, GrContext*, GrTexture* dummyTextures[2]);
* dummyTextures[] are valid textures that can optionally be used to construct GrTextureAccesses.
- * The first texture has config kSkia8888_PM_GrPixelConfig and the second has
+ * The first texture has config kSkia8888_GrPixelConfig and the second has
* kAlpha_8_GrPixelConfig. TestCreate functions are also free to create additional textures using
* the GrContext.
*/
diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h
index 6b484dea59..d79e0c36d2 100644
--- a/include/gpu/GrTypes.h
+++ b/include/gpu/GrTypes.h
@@ -307,9 +307,6 @@ enum GrPixelConfig {
#error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format."
#endif
-// This alias is deprecated and will be removed.
-static const GrPixelConfig kSkia8888_PM_GrPixelConfig = kSkia8888_GrPixelConfig;
-
// Returns true if the pixel config is 32 bits per pixel
static inline bool GrPixelConfigIs8888(GrPixelConfig config) {
switch (config) {
@@ -639,23 +636,5 @@ struct GrBackendRenderTargetDesc {
};
///////////////////////////////////////////////////////////////////////////////
-// Legacy names that will be kept until WebKit can be updated.
-
-typedef GrBackend GrEngine;
-static const GrBackend kOpenGL_Shaders_GrEngine = kOpenGL_GrBackend;
-
-typedef GrBackendContext GrPlatform3DContext;
-
-typedef GrBackendObject GrPlatform3DObject;
-
-typedef GrBackendTextureFlags GrPlatformTextureFlags;
-static const GrBackendTextureFlags kNone_GrPlatformTextureFlag = kNone_GrBackendTextureFlag;
-static const GrBackendTextureFlags kRenderTarget_GrPlatformTextureFlag = kRenderTarget_GrBackendTextureFlag;
-
-typedef GrBackendTextureDesc GrPlatformTextureDesc;
-
-typedef GrBackendRenderTargetDesc GrPlatformRenderTargetDesc;
-
-///////////////////////////////////////////////////////////////////////////////
#endif
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 7657813627..6266085d78 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -276,7 +276,7 @@ public:
fCurContext->setRenderTarget(fCurRenderTarget);
const SkBitmap& bm = win->getBitmap();
fCurRenderTarget->writePixels(0, 0, bm.width(), bm.height(),
- kSkia8888_PM_GrPixelConfig,
+ kSkia8888_GrPixelConfig,
bm.getPixels(),
bm.rowBytes());
}
@@ -294,7 +294,7 @@ public:
GrBackendRenderTargetDesc desc;
desc.fWidth = SkScalarRound(win->width());
desc.fHeight = SkScalarRound(win->height());
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_GrPixelConfig;
desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
GR_GL_GetIntegerv(fCurIntf, GR_GL_SAMPLES, &desc.fSampleCnt);
GR_GL_GetIntegerv(fCurIntf, GR_GL_STENCIL_BITS, &desc.fStencilBits);
diff --git a/src/gpu/GrAtlas.cpp b/src/gpu/GrAtlas.cpp
index 48a4f393e4..c1d6d3d693 100644
--- a/src/gpu/GrAtlas.cpp
+++ b/src/gpu/GrAtlas.cpp
@@ -149,7 +149,7 @@ static GrPixelConfig maskformat2pixelconfig(GrMaskFormat format) {
case kA565_GrMaskFormat:
return kRGB_565_GrPixelConfig;
case kA888_GrMaskFormat:
- return kSkia8888_PM_GrPixelConfig;
+ return kSkia8888_GrPixelConfig;
default:
GrAssert(!"unknown maskformat");
}
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 18f66b5edf..82c26912a3 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -144,7 +144,7 @@ static SkBitmap::Config grConfig2skConfig(GrPixelConfig config, bool* isOpaque)
case kRGBA_4444_GrPixelConfig:
*isOpaque = false;
return SkBitmap::kARGB_4444_Config;
- case kSkia8888_PM_GrPixelConfig:
+ case kSkia8888_GrPixelConfig:
// we don't currently have a way of knowing whether
// a 8888 is opaque based on the config.
*isOpaque = false;
@@ -284,7 +284,7 @@ GrPixelConfig config8888_to_grconfig_and_flags(SkCanvas::Config8888 config8888,
return kSkia8888_GrPixelConfig;
case SkCanvas::kNative_Unpremul_Config8888:
*flags = GrContext::kUnpremul_PixelOpsFlag;
- return kSkia8888_PM_GrPixelConfig;
+ return kSkia8888_GrPixelConfig;
case SkCanvas::kBGRA_Premul_Config8888:
*flags = 0;
return kBGRA_8888_GrPixelConfig;
@@ -300,7 +300,7 @@ GrPixelConfig config8888_to_grconfig_and_flags(SkCanvas::Config8888 config8888,
default:
GrCrash("Unexpected Config8888.");
*flags = 0; // suppress warning
- return kSkia8888_PM_GrPixelConfig;
+ return kSkia8888_GrPixelConfig;
}
}
}
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 2eb3800ac6..b10cf153a1 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -215,7 +215,7 @@ GrPixelConfig SkBitmapConfig2GrPixelConfig(SkBitmap::Config config) {
case SkBitmap::kARGB_4444_Config:
return kRGBA_4444_GrPixelConfig;
case SkBitmap::kARGB_8888_Config:
- return kSkia8888_PM_GrPixelConfig;
+ return kSkia8888_GrPixelConfig;
default:
// kNo_Config, kA1_Config missing, and kRLE_Index8_Config
return kUnknown_GrPixelConfig;
diff --git a/src/gpu/SkGrPixelRef.cpp b/src/gpu/SkGrPixelRef.cpp
index f8160ab9fe..8751c5d8bf 100644
--- a/src/gpu/SkGrPixelRef.cpp
+++ b/src/gpu/SkGrPixelRef.cpp
@@ -174,6 +174,6 @@ bool SkGrPixelRef::onReadPixels(SkBitmap* dst, const SkIRect* subset) {
SkAutoLockPixels al(*dst);
void* buffer = dst->getPixels();
return fSurface->readPixels(left, top, width, height,
- kSkia8888_PM_GrPixelConfig,
+ kSkia8888_GrPixelConfig,
buffer, dst->rowBytes());
}
diff --git a/tests/ClipCacheTest.cpp b/tests/ClipCacheTest.cpp
index aebbef5952..2186a6dba9 100644
--- a/tests/ClipCacheTest.cpp
+++ b/tests/ClipCacheTest.cpp
@@ -27,7 +27,7 @@ static GrTexture* createTexture(GrContext* context) {
// let Skia know we will be using this texture as a render target
desc.fFlags = kRenderTarget_GrTextureFlagBit;
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_GrPixelConfig;
desc.fWidth = X_SIZE;
desc.fHeight = Y_SIZE;
@@ -144,7 +144,7 @@ static void test_cache(skiatest::Reporter* reporter, GrContext* context) {
desc.fFlags = kRenderTarget_GrTextureFlagBit;
desc.fWidth = X_SIZE;
desc.fHeight = Y_SIZE;
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_GrPixelConfig;
cache.acquireMask(clip1.getTopmostGenID(), desc, bound1);
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 1d8ec35dc9..743b55447a 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -49,7 +49,7 @@ bool GrGpuGL::programUnitTest(int maxStages) {
maxStages = GrMin(maxStages, (int)GrDrawState::kNumStages);
GrTextureDesc dummyDesc;
- dummyDesc.fConfig = kSkia8888_PM_GrPixelConfig;
+ dummyDesc.fConfig = kSkia8888_GrPixelConfig;
dummyDesc.fWidth = 34;
dummyDesc.fHeight = 18;
SkAutoTUnref<GrTexture> dummyTexture1(this->createTexture(dummyDesc, NULL, 0));
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index df51a19a94..bb1696d93a 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -329,7 +329,7 @@ void ReadPixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) {
desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
desc.fWidth = DEV_W;
desc.fHeight = DEV_H;
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_GrPixelConfig;
desc.fOrigin = 1 == dtype ? kBottomLeft_GrSurfaceOrigin
: kTopLeft_GrSurfaceOrigin;
GrAutoScratchTexture ast(context, desc, GrContext::kExact_ScratchTexMatch);
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index 2d4cc64a43..73ffbc6dc9 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -329,7 +329,7 @@ SkDevice* createDevice(const CanvasConfig& c, GrContext* grCtx) {
desc.fFlags = kRenderTarget_GrTextureFlagBit;
desc.fWidth = DEV_W;
desc.fHeight = DEV_H;
- desc.fConfig = kSkia8888_PM_GrPixelConfig;
+ desc.fConfig = kSkia8888_GrPixelConfig;
desc.fOrigin = kGpu_TopLeft_DevType == c.fDevType ?
kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin;
GrAutoScratchTexture ast(grCtx, desc, GrContext::kExact_ScratchTexMatch);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 05:29:58 +0000