40746 2010-06-16 16:43:47 -0700 WebGLShader now keeps track of its shader type 2010-07-23 22:18:14 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED DUPLICATE 41380 P2 Enhancement --- 0 psawaya webkit-unassigned adele cmarrin kbr zmo oldest_to_newest 239146 0 58945 psawaya 2010-06-16 16:43:47 -0700 Created attachment 58945 WebGLShader now keeps track of its shader type WebGLShader needs to keep track of which type of shader it is (vertex, or fragment) to prepare for future enhancements to WebGL. 239149 1 58945 kbr 2010-06-16 16:57:14 -0700 Comment on attachment 58945 WebGLShader now keeps track of its shader type WebCore/html/canvas/WebGLShader.h:45 + GraphicsContext3D::WebGLEnumType shaderType; To conform to the WebKit style guide this should be "m_shaderType". WebCore/html/canvas/WebGLShader.cpp:43 + shaderType = type; This can be initialized in the initializer list: e.g. : CanvasObject(ctx) , m_shaderType(type) 239158 2 58945 cmarrin 2010-06-16 17:14:55 -0700 Comment on attachment 58945 WebGLShader now keeps track of its shader type > Index: WebCore/html/canvas/WebGLShader.cpp > =================================================================== > --- WebCore/html/canvas/WebGLShader.cpp (revision 60639) > +++ WebCore/html/canvas/WebGLShader.cpp (working copy) > @@ -40,6 +40,8 @@ PassRefPtr<WebGLShader> WebGLShader::cre > WebGLShader::WebGLShader(WebGLRenderingContext* ctx, GraphicsContext3D::WebGLEnumType type) > : CanvasObject(ctx) > { > + shaderType = type; > + > setObject(context()->graphicsContext3D()->createShader(type)); > } > > Index: WebCore/html/canvas/WebGLShader.h > =================================================================== > --- WebCore/html/canvas/WebGLShader.h (revision 60639) > +++ WebCore/html/canvas/WebGLShader.h (working copy) > @@ -41,6 +41,8 @@ namespace WebCore { > > private: > WebGLShader(WebGLRenderingContext*, GraphicsContext3D::WebGLEnumType); > + > + GraphicsContext3D::WebGLEnumType shaderType; > > virtual void _deleteObject(Platform3DObject); > WebCore/html/canvas/WebGLShader.cpp:43 + shaderType = type; This can be initialized in the constructor, as in: : CanvasObject(ctx) , m_shaderType(type) WebCore/html/canvas/WebGLShader.h:45 + GraphicsContext3D::WebGLEnumType shaderType; The convention is to name this m_shaderType WebCore/html/canvas/WebGLShader.h:46 + You should add an accessor: GraphicsContext3D::WebGLEnumType shaderType () const { return m_shaderType; } 239481 3 59015 psawaya 2010-06-17 11:03:10 -0700 Created attachment 59015 Added accessor, and made other code style changes as requested 239755 4 59015 sam 2010-06-17 22:02:14 -0700 Comment on attachment 59015 Added accessor, and made other code style changes as requested > WebGLShader::WebGLShader(WebGLRenderingContext* ctx, GraphicsContext3D::WebGLEnumType type) > - : CanvasObject(ctx) > + : CanvasObject(ctx), m_shaderType(type) The ", m_shaderType(type)" should be on its own line. This change is also missing a ChangeLog. Please read http://webkit.org/coding/contributing.html for more information on how to do this. 246361 5 zmo 2010-07-03 16:19:05 -0700 Sorry I didn't see this bug before. The feature is actually implemented in another bug: https://bugs.webkit.org/show_bug.cgi?id=41380. *** This bug has been marked as a duplicate of bug 41380 *** 255663 6 59015 dbates 2010-07-23 22:18:14 -0700 Comment on attachment 59015 Added accessor, and made other code style changes as requested Clearing commit-queue flag to get this out of the commit-queue. 58945 2010-06-16 16:43:47 -0700 2010-06-17 11:03:10 -0700 WebGLShader now keeps track of its shader type keep-track-of-shader-type text/plain 980 psawaya SW5kZXg6IFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFkZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFkZXIuY3BwCShyZXZpc2lvbiA2MDYzOSkKKysr IFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 MCw2ICs0MCw4IEBAIFBhc3NSZWZQdHI8V2ViR0xTaGFkZXI+IFdlYkdMU2hhZGVyOjpjcmUKIFdl YkdMU2hhZGVyOjpXZWJHTFNoYWRlcihXZWJHTFJlbmRlcmluZ0NvbnRleHQqIGN0eCwgR3JhcGhp Y3NDb250ZXh0M0Q6OldlYkdMRW51bVR5cGUgdHlwZSkKICAgICA6IENhbnZhc09iamVjdChjdHgp CiB7CisgICAgc2hhZGVyVHlwZSA9IHR5cGU7CisKICAgICBzZXRPYmplY3QoY29udGV4dCgpLT5n cmFwaGljc0NvbnRleHQzRCgpLT5jcmVhdGVTaGFkZXIodHlwZSkpOwogfQogCkluZGV4OiBXZWJD b3JlL2h0bWwvY2FudmFzL1dlYkdMU2hhZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1s L2NhbnZhcy9XZWJHTFNoYWRlci5oCShyZXZpc2lvbiA2MDYzOSkKKysrIFdlYkNvcmUvaHRtbC9j YW52YXMvV2ViR0xTaGFkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsOCBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKICAgICBwcml2YXRlOgogICAgICAgICBXZWJHTFNoYWRlcihXZWJH TFJlbmRlcmluZ0NvbnRleHQqLCBHcmFwaGljc0NvbnRleHQzRDo6V2ViR0xFbnVtVHlwZSk7Cisg ICAgICAgICAgICAKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0M0Q6OldlYkdMRW51bVR5cGUgc2hh ZGVyVHlwZTsKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgX2RlbGV0ZU9iamVjdChQbGF0Zm9ybTNE T2JqZWN0KTsKIAo= 59015 2010-06-17 11:03:10 -0700 2010-07-23 22:18:13 -0700 Added accessor, and made other code style changes as requested keep-track-of-shader-type2 text/plain 1325 psawaya SW5kZXg6IFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFkZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFkZXIuY3BwCShyZXZpc2lvbiA2MDYzOSkKKysr IFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z OCw3ICszOCw3IEBAIFBhc3NSZWZQdHI8V2ViR0xTaGFkZXI+IFdlYkdMU2hhZGVyOjpjcmUKIH0K IAogV2ViR0xTaGFkZXI6OldlYkdMU2hhZGVyKFdlYkdMUmVuZGVyaW5nQ29udGV4dCogY3R4LCBH cmFwaGljc0NvbnRleHQzRDo6V2ViR0xFbnVtVHlwZSB0eXBlKQotICAgIDogQ2FudmFzT2JqZWN0 KGN0eCkKKyAgICA6IENhbnZhc09iamVjdChjdHgpLCBtX3NoYWRlclR5cGUodHlwZSkKIHsKICAg ICBzZXRPYmplY3QoY29udGV4dCgpLT5ncmFwaGljc0NvbnRleHQzRCgpLT5jcmVhdGVTaGFkZXIo dHlwZSkpOwogfQpJbmRleDogV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFNoYWRlci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xTaGFkZXIuaAkocmV2aXNpb24gNjA2 MzkpCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMU2hhZGVyLmgJKHdvcmtpbmcgY29weSkK QEAgLTM2LDExICszNiwxNSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgV2ViR0xT aGFkZXIgOiBwdWJsaWMgQ2FudmFzT2JqZWN0IHsKICAgICBwdWJsaWM6CiAgICAgICAgIHZpcnR1 YWwgfldlYkdMU2hhZGVyKCkgeyBkZWxldGVPYmplY3QoKTsgfQotICAgICAgICAKKwogICAgICAg ICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJHTFNoYWRlcj4gY3JlYXRlKFdlYkdMUmVuZGVyaW5nQ29u dGV4dCosIEdyYXBoaWNzQ29udGV4dDNEOjpXZWJHTEVudW1UeXBlKTsKIAorICAgICAgICBHcmFw aGljc0NvbnRleHQzRDo6V2ViR0xFbnVtVHlwZSBzaGFkZXJUeXBlICgpIGNvbnN0IHsgcmV0dXJu IG1fc2hhZGVyVHlwZTsgfQorCiAgICAgcHJpdmF0ZToKICAgICAgICAgV2ViR0xTaGFkZXIoV2Vi R0xSZW5kZXJpbmdDb250ZXh0KiwgR3JhcGhpY3NDb250ZXh0M0Q6OldlYkdMRW51bVR5cGUpOwor ICAgICAgICAgICAgCisgICAgICAgIEdyYXBoaWNzQ29udGV4dDNEOjpXZWJHTEVudW1UeXBlIG1f c2hhZGVyVHlwZTsKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgX2RlbGV0ZU9iamVjdChQbGF0Zm9y bTNET2JqZWN0KTsKIAo=