b=523229; WebGL rename clearDepthf/depthRangef to get rid of f suffix; r=mwsteele
authorVladimir Vukicevic <vladimir@pobox.com>
Mon, 19 Oct 2009 15:14:09 -0700
changeset 34253 f55bc23654b930fa9a9cedd7b4a0caf349ebc4a0
parent 34252 6c793e95c534f3cd0902e5f60532c427273beaea
child 34254 3865bf230c4917cfb03e40056edbc5ff4eed99ad
push id115
push userbmcbride@mozilla.com
push dateMon, 19 Oct 2009 23:27:00 +0000
reviewersmwsteele
bugs523229
milestone1.9.3a1pre
b=523229; WebGL rename clearDepthf/depthRangef to get rid of f suffix; r=mwsteele
content/canvas/src/WebGLContextGL.cpp
dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl
--- a/content/canvas/src/WebGLContextGL.cpp
+++ b/content/canvas/src/WebGLContextGL.cpp
@@ -582,21 +582,20 @@ WebGLContext::CheckFramebufferStatus(GLe
     *retval = gl->fCheckFramebufferStatus(target);
     return NS_OK;
 }
 
 GL_SAME_METHOD_1(Clear, Clear, PRUint32)
 
 GL_SAME_METHOD_4(ClearColor, ClearColor, float, float, float, float)
 
-// XXX the Web IDL method should be glClearDepth!
 #ifdef USE_GLES2
-GL_SAME_METHOD_1(ClearDepthf, ClearDepthf, float)
+GL_SAME_METHOD_1(ClearDepthf, ClearDepth, float)
 #else
-GL_SAME_METHOD_1(ClearDepth, ClearDepthf, float)
+GL_SAME_METHOD_1(ClearDepth, ClearDepth, float)
 #endif
 
 GL_SAME_METHOD_1(ClearStencil, ClearStencil, PRInt32)
 
 GL_SAME_METHOD_4(ColorMask, ColorMask, GLboolean, GLboolean, GLboolean, GLboolean)
 
 NS_IMETHODIMP
 WebGLContext::CopyTexImage2D(GLenum target,
@@ -858,21 +857,20 @@ WebGLContext::DetachShader(nsIWebGLProgr
 
     return NS_OK;
 }
 
 GL_SAME_METHOD_1(DepthFunc, DepthFunc, GLenum)
 
 GL_SAME_METHOD_1(DepthMask, DepthMask, GLboolean)
 
-// XXX should just be glDepthRange in webgl!
 #ifdef USE_GLES2
-GL_SAME_METHOD_2(DepthRangef, DepthRangef, float, float)
+GL_SAME_METHOD_2(DepthRangef, DepthRange, float, float)
 #else
-GL_SAME_METHOD_2(DepthRange, DepthRangef, float, float)
+GL_SAME_METHOD_2(DepthRange, DepthRange, float, float)
 #endif
 
 // XXX arg check!
 GL_SAME_METHOD_1(Disable, Disable, GLenum)
 
 NS_IMETHODIMP
 WebGLContext::DisableVertexAttribArray(GLuint index)
 {
--- a/dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl
+++ b/dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl
@@ -643,17 +643,17 @@ interface nsICanvasRenderingContextWebGL
   void bufferData (in GLenum target, in nsICanvasArray data, in GLenum usage);
 
   // Modified: void glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void* data);
   void bufferSubData (in GLenum target, in GLuint offset, in nsICanvasArray data);
 
   GLenum checkFramebufferStatus (in GLenum target);
   void clear (in GLbitfield mask);
   void clearColor (in GLclampf red, in GLclampf green, in GLclampf blue, in GLclampf alpha);
-  void clearDepthf (in GLclampf depth);
+  void clearDepth (in GLclampf depth);
   void clearStencil (in GLint s);
   void colorMask (in GLboolean red, in GLboolean green, in GLboolean blue, in GLboolean alpha);
   void compileShader (in nsIWebGLShader shader);
 
   //void glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
   //void glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
 
   void copyTexImage2D (in GLenum target, in GLint level, in GLenum internalformat, 
@@ -674,17 +674,17 @@ interface nsICanvasRenderingContextWebGL
   void deleteProgram (in nsIWebGLProgram program);
   void deleteFramebuffer (in nsIWebGLFramebuffer framebuffer);
   void deleteRenderbuffer (in nsIWebGLRenderbuffer renderbuffer);
   void deleteShader (in nsIWebGLShader shader);
   void deleteTexture (in nsIWebGLTexture texture);
 
   void depthFunc (in GLenum func);
   void depthMask (in GLboolean flag);
-  void depthRangef (in GLclampf zNear, in GLclampf zFar);
+  void depthRange (in GLclampf zNear, in GLclampf zFar);
   void detachShader (in nsIWebGLProgram program, in nsIWebGLShader shader);
   void disable (in GLenum cap);
   void disableVertexAttribArray (in GLuint index);
   void drawArrays (in GLenum mode, in GLint first, in GLsizei count);
 
   // Modified: void glDrawElements (GLenum mode, GLsizei count, GLenum type, const void* indices);
   void drawElements (in GLenum mode, in GLuint count, in GLenum type, in GLuint offset);