OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 13 matching lines...) Expand all Loading... |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 | 27 |
28 #include "modules/webgl/WebGLTexture.h" | 28 #include "modules/webgl/WebGLTexture.h" |
29 | 29 |
30 #include "modules/webgl/WebGLRenderingContextBase.h" | 30 #include "modules/webgl/WebGLRenderingContextBase.h" |
31 | 31 |
32 namespace blink { | 32 namespace blink { |
33 | 33 |
34 WebGLTexture* WebGLTexture::create(WebGLRenderingContextBase* ctx) | 34 PassRefPtrWillBeRawPtr<WebGLTexture> WebGLTexture::create(WebGLRenderingContextB
ase* ctx) |
35 { | 35 { |
36 return new WebGLTexture(ctx); | 36 return adoptRefWillBeNoop(new WebGLTexture(ctx)); |
37 } | 37 } |
38 | 38 |
39 WebGLTexture::WebGLTexture(WebGLRenderingContextBase* ctx) | 39 WebGLTexture::WebGLTexture(WebGLRenderingContextBase* ctx) |
40 : WebGLSharedPlatform3DObject(ctx) | 40 : WebGLSharedPlatform3DObject(ctx) |
41 , m_target(0) | 41 , m_target(0) |
42 , m_minFilter(GL_NEAREST_MIPMAP_LINEAR) | 42 , m_minFilter(GL_NEAREST_MIPMAP_LINEAR) |
43 , m_magFilter(GL_LINEAR) | 43 , m_magFilter(GL_LINEAR) |
44 , m_wrapR(GL_REPEAT) | 44 , m_wrapR(GL_REPEAT) |
45 , m_wrapS(GL_REPEAT) | 45 , m_wrapS(GL_REPEAT) |
46 , m_wrapT(GL_REPEAT) | 46 , m_wrapT(GL_REPEAT) |
47 , m_isNPOT(false) | 47 , m_isNPOT(false) |
48 , m_isCubeComplete(false) | 48 , m_isCubeComplete(false) |
49 , m_isComplete(false) | 49 , m_isComplete(false) |
50 , m_needToUseBlackTexture(false) | 50 , m_needToUseBlackTexture(false) |
51 , m_isFloatType(false) | 51 , m_isFloatType(false) |
52 , m_isHalfFloatType(false) | 52 , m_isHalfFloatType(false) |
53 , m_isWebGL2OrHigher(ctx->isWebGL2OrHigher()) | 53 , m_isWebGL2OrHigher(ctx->isWebGL2OrHigher()) |
54 , m_immutable(false) | 54 , m_immutable(false) |
55 , m_baseLevel(0) | 55 , m_baseLevel(0) |
56 , m_maxLevel(1000) | 56 , m_maxLevel(1000) |
57 { | 57 { |
58 setObject(ctx->webContext()->createTexture()); | 58 setObject(ctx->webContext()->createTexture()); |
59 } | 59 } |
60 | 60 |
61 WebGLTexture::~WebGLTexture() | 61 WebGLTexture::~WebGLTexture() |
62 { | 62 { |
63 // See the comment in WebGLObject::detachAndDeleteObject(). | 63 // Always perform detach here to ensure that platform object |
| 64 // deletion happens with Oilpan enabled. It keeps the code regular |
| 65 // to do it with or without Oilpan enabled. |
| 66 // |
| 67 // See comment in WebGLBuffer's destructor for additional |
| 68 // information on why this is done for WebGLSharedObject-derived |
| 69 // objects. |
64 detachAndDeleteObject(); | 70 detachAndDeleteObject(); |
65 } | 71 } |
66 | 72 |
67 void WebGLTexture::setTarget(GLenum target, GLint maxLevel) | 73 void WebGLTexture::setTarget(GLenum target, GLint maxLevel) |
68 { | 74 { |
69 if (!object()) | 75 if (!object()) |
70 return; | 76 return; |
71 // Target is finalized the first time bindTexture() is called. | 77 // Target is finalized the first time bindTexture() is called. |
72 if (m_target) | 78 if (m_target) |
73 return; | 79 return; |
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: | 596 case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: |
591 case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: | 597 case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: |
592 case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: | 598 case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: |
593 return GL_UNSIGNED_BYTE; | 599 return GL_UNSIGNED_BYTE; |
594 default: | 600 default: |
595 return GL_NONE; | 601 return GL_NONE; |
596 } | 602 } |
597 } | 603 } |
598 | 604 |
599 } // namespace blink | 605 } // namespace blink |
OLD | NEW |