ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7833 from fredj/f_webgl_named

Browse Source 
Fix createEmptyTexture function call in ol/webgl/Context
This commit is contained in:
Frédéric Junod
2018-02-15 15:18:38 +01:00
committed by GitHub
parent 328fbc24b4 ab4b82ba57
commit 8161cd7f1c
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/webgl/Context.js
+4 -10
View File
@@ -272,7 +272,7 @@ WebGLContext.prototype.initHitDetectionFramebuffer_ = function() {
const framebuffer = gl.createFramebuffer(); const framebuffer = gl.createFramebuffer();
gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer); gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer);
const texture = WebGLContext.createEmptyTexture(gl, 1, 1); const texture = createEmptyTexture(gl, 1, 1);
const renderbuffer = gl.createRenderbuffer(); const renderbuffer = gl.createRenderbuffer();
gl.bindRenderbuffer(gl.RENDERBUFFER, renderbuffer); gl.bindRenderbuffer(gl.RENDERBUFFER, renderbuffer);
gl.renderbufferStorage(gl.RENDERBUFFER, gl.DEPTH_COMPONENT16, 1, 1); gl.renderbufferStorage(gl.RENDERBUFFER, gl.DEPTH_COMPONENT16, 1, 1);
@@ -342,13 +342,9 @@ function createTextureInternal(gl, opt_wrapS, opt_wrapT) {
* @param {number=} opt_wrapT wrapT. * @param {number=} opt_wrapT wrapT.
* @return {WebGLTexture} The texture. * @return {WebGLTexture} The texture.
*/ */
export function createEmptyTexture( export function createEmptyTexture(gl, width, height, opt_wrapS, opt_wrapT) {
gl, width, height, opt_wrapS, opt_wrapT) {
const texture = createTextureInternal(gl, opt_wrapS, opt_wrapT); const texture = createTextureInternal(gl, opt_wrapS, opt_wrapT);
gl.texImage2D( gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, width, height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
gl.TEXTURE_2D, 0, gl.RGBA, width, height, 0, gl.RGBA, gl.UNSIGNED_BYTE,
null);
return texture; return texture;
} }
@@ -362,9 +358,7 @@ export function createEmptyTexture(
*/ */
export function createTexture(gl, image, opt_wrapS, opt_wrapT) { export function createTexture(gl, image, opt_wrapS, opt_wrapT) {
const texture = createTextureInternal(gl, opt_wrapS, opt_wrapT); const texture = createTextureInternal(gl, opt_wrapS, opt_wrapT);
gl.texImage2D( gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image);
gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image);
return texture; return texture;
} }