diff --git a/cocos/gfx/define.ts b/cocos/gfx/define.ts index cbb9bcfa31..eaa588a83f 100644 --- a/cocos/gfx/define.ts +++ b/cocos/gfx/define.ts @@ -425,8 +425,8 @@ export enum GFXQueueType { // Interfaces export interface GFXRect { - left: number; - top: number; + x: number; + y: number; width: number; height: number; } diff --git a/cocos/gfx/device.ts b/cocos/gfx/device.ts index 38c9da9bad..9bda923c72 100644 --- a/cocos/gfx/device.ts +++ b/cocos/gfx/device.ts @@ -13,6 +13,7 @@ import { GFXCommandBufferInfo, GFXCommandBuffer } from './command-buffer'; import { GFXCommandAllocatorInfo, GFXCommandAllocator } from './command-allocator'; import { GFXWindowInfo, GFXWindow } from './window'; import { GFXBindingLayoutInfo, GFXBindingLayout } from './binding-layout'; +import { GFXRect } from './define'; export enum GFXFeature { }; @@ -25,25 +26,27 @@ export interface GFXDeviceInfo { export abstract class GFXDevice { - public abstract initialize(info : GFXDeviceInfo) : boolean; - public abstract destroy() : void; - public abstract createBuffer(info: GFXBufferInfo) : GFXBuffer | null; - public abstract createTexture(info: GFXTextureInfo) : GFXTexture | null; - public abstract createTextureView(info: GFXTextureViewInfo) : GFXTextureView | null; - public abstract createSampler(info: GFXSamplerInfo) : GFXSampler | null; - public abstract createBindingLayout(info: GFXBindingLayoutInfo) : GFXBindingLayout | null; - public abstract createShader(info: GFXShaderInfo) : GFXShader | null; - public abstract createInputAssembler(info: GFXInputAssemblerInfo) : GFXInputAssembler | null; - public abstract createRenderPass(info: GFXRenderPassInfo) : GFXRenderPass | null; - public abstract createFramebuffer(info: GFXFramebufferInfo) : GFXFramebuffer | null; - public abstract createPipelineLayout(info: GFXPipelineLayoutInfo) : GFXPipelineLayout | null; - public abstract createPipelineState(info: GFXPipelineStateInfo) : GFXPipelineState | null; + public abstract initialize(info: GFXDeviceInfo): boolean; + public abstract destroy(): void; + public abstract createBuffer(info: GFXBufferInfo): GFXBuffer | null; + public abstract createTexture(info: GFXTextureInfo): GFXTexture | null; + public abstract createTextureView(info: GFXTextureViewInfo): GFXTextureView | null; + public abstract createSampler(info: GFXSamplerInfo): GFXSampler | null; + public abstract createBindingLayout(info: GFXBindingLayoutInfo): GFXBindingLayout | null; + public abstract createShader(info: GFXShaderInfo): GFXShader | null; + public abstract createInputAssembler(info: GFXInputAssemblerInfo): GFXInputAssembler | null; + public abstract createRenderPass(info: GFXRenderPassInfo): GFXRenderPass | null; + public abstract createFramebuffer(info: GFXFramebufferInfo): GFXFramebuffer | null; + public abstract createPipelineLayout(info: GFXPipelineLayoutInfo): GFXPipelineLayout | null; + public abstract createPipelineState(info: GFXPipelineStateInfo): GFXPipelineState | null; public abstract createCommandAllocator(info: GFXCommandAllocatorInfo): GFXCommandAllocator | null; - public abstract createCommandBuffer(info: GFXCommandBufferInfo) : GFXCommandBuffer | null; - public abstract createQueue(info: GFXQueueInfo) : GFXQueue | null; - public abstract createWindow(info: GFXWindowInfo) : GFXWindow | null; + public abstract createCommandBuffer(info: GFXCommandBufferInfo): GFXCommandBuffer | null; + public abstract createQueue(info: GFXQueueInfo): GFXQueue | null; + public abstract createWindow(info: GFXWindowInfo): GFXWindow | null; public abstract present(); - + + public abstract copyBufferToTexture2D(buffer: ArrayBuffer, texture: GFXTexture, rect?: GFXRect); + public get canvas(): HTMLCanvasElement { return this._canvas; } @@ -97,18 +100,18 @@ export abstract class GFXDevice { } protected _canvas: HTMLCanvasElement | null = null; - protected _deviceName : string = ""; - protected _renderer : string = ""; - protected _vendor : string = ""; - protected _version : string = ""; - protected _queue : GFXQueue | null = null; - protected _mainWindow : GFXWindow | null = null; + protected _deviceName: string = ""; + protected _renderer: string = ""; + protected _vendor: string = ""; + protected _version: string = ""; + protected _queue: GFXQueue | null = null; + protected _mainWindow: GFXWindow | null = null; protected _cmdAllocator: GFXCommandAllocator | null = null; - protected _maxVertexAttributes : number = 0; - protected _maxVertexUniformVectors : number = 0; - protected _maxFragmentUniformVectors : number = 0; - protected _maxTextureUnits : number = 0; - protected _maxVertexTextureUnits : number = 0; - protected _depthBits : number = 0; - protected _stencilBits : number = 0; + protected _maxVertexAttributes: number = 0; + protected _maxVertexUniformVectors: number = 0; + protected _maxFragmentUniformVectors: number = 0; + protected _maxTextureUnits: number = 0; + protected _maxVertexTextureUnits: number = 0; + protected _depthBits: number = 0; + protected _stencilBits: number = 0; }; diff --git a/cocos/gfx/webgl/webgl-commands.ts b/cocos/gfx/webgl/webgl-commands.ts index f94e8e096e..d837938319 100644 --- a/cocos/gfx/webgl/webgl-commands.ts +++ b/cocos/gfx/webgl/webgl-commands.ts @@ -348,7 +348,7 @@ export class WebGLCmdObject { export class WebGLCmdBeginRenderPass extends WebGLCmdObject { gpuFramebuffer: WebGLGPUFramebuffer | null = null; - renderArea: GFXRect = { left: 0.0, top: 0.0, width: 0.0, height: 0.0 }; + renderArea: GFXRect = { x: 0, y: 0, width: 0, height: 0 }; clearColors: GFXColor[] = []; clearDepth: number = 1.0; clearStencil: number = 0; @@ -1148,7 +1148,7 @@ export function WebGLCmdFuncExecuteCmds(device: WebGLGFXDevice, cmdPackage: WebG for (let i = 0; i < cmdPackage.cmds.length; ++i) { let cmd = cmdPackage.cmds[i]; let cmdId = cmdIds[cmd]++; - + switch (cmdPackage.cmds[i]) { case WebGLCmd.BEGIN_RENDER_PASS: { let cmd0 = cmdPackage.beginRenderPassCmds[cmdId]; @@ -1157,33 +1157,33 @@ export function WebGLCmdFuncExecuteCmds(device: WebGLGFXDevice, cmdPackage: WebG if (cmd0.gpuFramebuffer) { if (device.stateCache.glFramebuffer !== cmd0.gpuFramebuffer.glFramebuffer) { - let glFBO = (cmd0.gpuFramebuffer.glFramebuffer !== 0? cmd0.gpuFramebuffer.glFramebuffer : null); + let glFBO = (cmd0.gpuFramebuffer.glFramebuffer !== 0 ? cmd0.gpuFramebuffer.glFramebuffer : null); gl.bindFramebuffer(WebGLRenderingContext.FRAMEBUFFER, glFBO); device.stateCache.glFramebuffer = cmd0.gpuFramebuffer.glFramebuffer; } - if (device.stateCache.viewport.left !== cmd0.renderArea.left || - device.stateCache.viewport.top !== cmd0.renderArea.top || + if (device.stateCache.viewport.left !== cmd0.renderArea.x || + device.stateCache.viewport.top !== cmd0.renderArea.y || device.stateCache.viewport.width !== cmd0.renderArea.width || device.stateCache.viewport.height !== cmd0.renderArea.height) { - gl.viewport(cmd0.renderArea.left, cmd0.renderArea.top, cmd0.renderArea.width, cmd0.renderArea.height); + gl.viewport(cmd0.renderArea.x, cmd0.renderArea.y, cmd0.renderArea.width, cmd0.renderArea.height); - device.stateCache.viewport.left = cmd0.renderArea.left; - device.stateCache.viewport.top = cmd0.renderArea.top; + device.stateCache.viewport.left = cmd0.renderArea.x; + device.stateCache.viewport.top = cmd0.renderArea.y; device.stateCache.viewport.width = cmd0.renderArea.width; device.stateCache.viewport.height = cmd0.renderArea.height; } - if (device.stateCache.scissorRect.left !== cmd0.renderArea.left || - device.stateCache.scissorRect.top !== cmd0.renderArea.top || + if (device.stateCache.scissorRect.x !== cmd0.renderArea.x || + device.stateCache.scissorRect.y !== cmd0.renderArea.y || device.stateCache.scissorRect.width !== cmd0.renderArea.width || device.stateCache.scissorRect.height !== cmd0.renderArea.height) { - gl.scissor(cmd0.renderArea.left, cmd0.renderArea.top, cmd0.renderArea.width, cmd0.renderArea.height); + gl.scissor(cmd0.renderArea.x, cmd0.renderArea.y, cmd0.renderArea.width, cmd0.renderArea.height); - device.stateCache.scissorRect.left = cmd0.renderArea.left; - device.stateCache.scissorRect.top = cmd0.renderArea.top; + device.stateCache.scissorRect.x = cmd0.renderArea.x; + device.stateCache.scissorRect.y = cmd0.renderArea.y; device.stateCache.scissorRect.width = cmd0.renderArea.width; device.stateCache.scissorRect.height = cmd0.renderArea.height; } @@ -1947,7 +1947,7 @@ export function WebGLCmdFuncExecuteCmds(device: WebGLGFXDevice, cmdPackage: WebG let cmd6 = cmdPackage.updateBufferCmds[cmdId]; if (cmd6.gpuBuffer) { - if(cmd6.buffer && cmd6.gpuBuffer.bufferView) { + if (cmd6.buffer && cmd6.gpuBuffer.bufferView) { cmd6.gpuBuffer.bufferView.set(new Uint8Array(cmd6.buffer), cmd6.offset); } @@ -1983,130 +1983,7 @@ export function WebGLCmdFuncExecuteCmds(device: WebGLGFXDevice, cmdPackage: WebG case WebGLCmd.COPY_BUFFER_TO_TEXTURE: { let cmd7 = cmdPackage.copyBufferToTextureCmds[cmdId]; if (cmd7.gpuBuffer && cmd7.gpuBuffer.bufferView && cmd7.gpuTexture) { - - switch (cmd7.gpuTexture.glTarget) { - case WebGLRenderingContext.TEXTURE_2D: { - let glTexUnit = device.stateCache.glTex2DUnits[device.stateCache.texUnit]; - if (glTexUnit.glTexture !== cmd7.gpuTexture.glTexture) { - gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, cmd7.gpuTexture.glTexture); - glTexUnit.glTexture = cmd7.gpuTexture.glTexture; - } - - let isCompressed = GFXFormatInfos[cmd7.gpuTexture.format].isCompressed; - if (!isCompressed) { - for (let r = 0; r < cmd7.regions.length; ++r) { - let region = cmd7.regions[r]; - let buffOffset = region.buffOffset; + region.buffTexHeight * region.buffStride; - - let w = region.texExtent.width; - let h = region.texExtent.height; - - for (let m = region.texSubres.baseMipLevel; m < region.texSubres.levelCount; ++m) { - let memSize = GFXFormatSize(cmd7.gpuTexture.format, w, h, 1); - let data = cmd7.gpuBuffer.bufferView.subarray(buffOffset, buffOffset + memSize); - - gl.texSubImage2D(WebGLRenderingContext.TEXTURE_2D, m, - region.texOffset.x, region.texOffset.y, w, h, - cmd7.gpuTexture.glFormat, cmd7.gpuTexture.glType, data); - - buffOffset += memSize; - w = Math.max(1, w >> 1); - h = Math.max(1, w >> 1); - } - } - } else { - for (let r = 0; r < cmd7.regions.length; ++r) { - let region = cmd7.regions[r]; - let buffOffset = region.buffOffset + region.buffTexHeight * region.buffStride; - - let w = region.texExtent.width; - let h = region.texExtent.height; - - for (let m = region.texSubres.baseMipLevel; m < region.texSubres.levelCount; ++m) { - let memSize = GFXFormatSize(cmd7.gpuTexture.format, w, h, 1); - let data = cmd7.gpuBuffer.bufferView.subarray(buffOffset, buffOffset + memSize); - - gl.compressedTexSubImage2D(WebGLRenderingContext.TEXTURE_2D, m, - region.texOffset.x, region.texOffset.y, w, h, - cmd7.gpuTexture.glFormat, data); - - buffOffset += memSize; - w = Math.max(1, w >> 1); - h = Math.max(1, w >> 1); - } - } - } - break; - } - case WebGLRenderingContext.TEXTURE_CUBE_MAP: { - let glTexUnit = device.stateCache.glTexCubeUnits[device.stateCache.texUnit]; - if (glTexUnit.glTexture !== cmd7.gpuTexture.glTexture) { - gl.bindTexture(WebGLRenderingContext.TEXTURE_CUBE_MAP, cmd7.gpuTexture.glTexture); - glTexUnit.glTexture = cmd7.gpuTexture.glTexture; - } - - let isCompressed = GFXFormatInfos[cmd7.gpuTexture.format].isCompressed; - if (!isCompressed) { - for (let r = 0; r < cmd7.regions.length; ++r) { - let region = cmd7.regions[r]; - let buffOffset = region.buffOffset + region.buffTexHeight * region.buffStride; - - let w = region.texExtent.width; - let h = region.texExtent.height; - - for (let f = 0; f < 6; ++f) { - let w = region.texExtent.width; - let h = region.texExtent.height; - - for (let m = region.texSubres.baseMipLevel; m < region.texSubres.levelCount; ++m) { - let memSize = GFXFormatSize(cmd7.gpuTexture.format, w, h, 1); - let data = cmd7.gpuBuffer.bufferView.subarray(buffOffset, buffOffset + memSize); - - gl.texSubImage2D(WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X + f, m, - region.texOffset.x, region.texOffset.y, w, h, - cmd7.gpuTexture.glFormat, cmd7.gpuTexture.glType, data); - - buffOffset += memSize; - w = Math.max(1, w >> 1); - h = Math.max(1, w >> 1); - } - } - } - } else { - for (let r = 0; r < cmd7.regions.length; ++r) { - let region = cmd7.regions[r]; - let buffOffset = region.buffOffset + region.buffTexHeight * region.buffStride; - - for (let f = 0; f < 6; ++f) { - let w = region.texExtent.width; - let h = region.texExtent.height; - - for (let m = region.texSubres.baseMipLevel; m < region.texSubres.levelCount; ++m) { - let memSize = GFXFormatSize(cmd7.gpuTexture.format, w, h, 1); - let data = cmd7.gpuBuffer.bufferView.subarray(buffOffset, buffOffset + memSize); - - gl.compressedTexSubImage2D(WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X + f, m, - region.texOffset.x, region.texOffset.y, w, h, - cmd7.gpuTexture.glFormat, data); - - buffOffset += memSize; - w = Math.max(1, w >> 1); - h = Math.max(1, w >> 1); - } - } - } - } - break; - } - default: { - console.error("Unsupported GL texture type, copy buffer to texture failed."); - continue; - } - } - - if (cmd7.gpuTexture.flags & GFXTextureFlagBit.GEN_MIPMAP) { - gl.generateMipmap(cmd7.gpuTexture.glTarget); - } + WebGLCmdFuncCopyBufferToTexture2D(device, cmd7.gpuBuffer.bufferView, cmd7.gpuTexture, cmd7.regions); } break; @@ -2114,3 +1991,135 @@ export function WebGLCmdFuncExecuteCmds(device: WebGLGFXDevice, cmdPackage: WebG } // switch } // for } + +export function WebGLCmdFuncCopyBufferToTexture2D( + device: WebGLGFXDevice, + bufferView: Uint8Array, + gpuTexture: WebGLGPUTexture, + regions: GFXBufferTextureCopy[]) { + + let gl = device.gl; + + switch (gpuTexture.glTarget) { + case WebGLRenderingContext.TEXTURE_2D: { + let glTexUnit = device.stateCache.glTex2DUnits[device.stateCache.texUnit]; + if (glTexUnit.glTexture !== gpuTexture.glTexture) { + gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, gpuTexture.glTexture); + glTexUnit.glTexture = gpuTexture.glTexture; + } + + let isCompressed = GFXFormatInfos[gpuTexture.format].isCompressed; + if (!isCompressed) { + for (let r = 0; r < regions.length; ++r) { + let region = regions[r]; + let buffOffset = region.buffOffset; + region.buffTexHeight * region.buffStride; + + let w = region.texExtent.width; + let h = region.texExtent.height; + + for (let m = region.texSubres.baseMipLevel; m < region.texSubres.levelCount; ++m) { + let memSize = GFXFormatSize(gpuTexture.format, w, h, 1); + let data = bufferView.subarray(buffOffset, buffOffset + memSize); + + gl.texSubImage2D(WebGLRenderingContext.TEXTURE_2D, m, + region.texOffset.x, region.texOffset.y, w, h, + gpuTexture.glFormat, gpuTexture.glType, data); + + buffOffset += memSize; + w = Math.max(1, w >> 1); + h = Math.max(1, w >> 1); + } + } + } else { + for (let r = 0; r < regions.length; ++r) { + let region = regions[r]; + let buffOffset = region.buffOffset + region.buffTexHeight * region.buffStride; + + let w = region.texExtent.width; + let h = region.texExtent.height; + + for (let m = region.texSubres.baseMipLevel; m < region.texSubres.levelCount; ++m) { + let memSize = GFXFormatSize(gpuTexture.format, w, h, 1); + let data = bufferView.subarray(buffOffset, buffOffset + memSize); + + gl.compressedTexSubImage2D(WebGLRenderingContext.TEXTURE_2D, m, + region.texOffset.x, region.texOffset.y, w, h, + gpuTexture.glFormat, data); + + buffOffset += memSize; + w = Math.max(1, w >> 1); + h = Math.max(1, w >> 1); + } + } + } + break; + } + case WebGLRenderingContext.TEXTURE_CUBE_MAP: { + let glTexUnit = device.stateCache.glTexCubeUnits[device.stateCache.texUnit]; + if (glTexUnit.glTexture !== gpuTexture.glTexture) { + gl.bindTexture(WebGLRenderingContext.TEXTURE_CUBE_MAP, gpuTexture.glTexture); + glTexUnit.glTexture = gpuTexture.glTexture; + } + + let isCompressed = GFXFormatInfos[gpuTexture.format].isCompressed; + if (!isCompressed) { + for (let r = 0; r < regions.length; ++r) { + let region = regions[r]; + let buffOffset = region.buffOffset + region.buffTexHeight * region.buffStride; + + let w = region.texExtent.width; + let h = region.texExtent.height; + + for (let f = 0; f < 6; ++f) { + let w = region.texExtent.width; + let h = region.texExtent.height; + + for (let m = region.texSubres.baseMipLevel; m < region.texSubres.levelCount; ++m) { + let memSize = GFXFormatSize(gpuTexture.format, w, h, 1); + let data = bufferView.subarray(buffOffset, buffOffset + memSize); + + gl.texSubImage2D(WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X + f, m, + region.texOffset.x, region.texOffset.y, w, h, + gpuTexture.glFormat, gpuTexture.glType, data); + + buffOffset += memSize; + w = Math.max(1, w >> 1); + h = Math.max(1, w >> 1); + } + } + } + } else { + for (let r = 0; r < regions.length; ++r) { + let region = regions[r]; + let buffOffset = region.buffOffset + region.buffTexHeight * region.buffStride; + + for (let f = 0; f < 6; ++f) { + let w = region.texExtent.width; + let h = region.texExtent.height; + + for (let m = region.texSubres.baseMipLevel; m < region.texSubres.levelCount; ++m) { + let memSize = GFXFormatSize(gpuTexture.format, w, h, 1); + let data = bufferView.subarray(buffOffset, buffOffset + memSize); + + gl.compressedTexSubImage2D(WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X + f, m, + region.texOffset.x, region.texOffset.y, w, h, + gpuTexture.glFormat, data); + + buffOffset += memSize; + w = Math.max(1, w >> 1); + h = Math.max(1, w >> 1); + } + } + } + } + break; + } + default: { + console.error("Unsupported GL texture type, copy buffer to texture failed."); + } + } + + if (gpuTexture.flags & GFXTextureFlagBit.GEN_MIPMAP) { + gl.generateMipmap(gpuTexture.glTarget); + } +} diff --git a/cocos/gfx/webgl/webgl-device.ts b/cocos/gfx/webgl/webgl-device.ts index 7d1197b681..8faf2abb87 100644 --- a/cocos/gfx/webgl/webgl-device.ts +++ b/cocos/gfx/webgl/webgl-device.ts @@ -4,7 +4,7 @@ import { WebGLGFXBuffer } from './webgl-buffer'; import { WebGLGFXQueue } from './webgl-queue'; import { WebGLStateCache } from './webgl-state-cache'; import { WebGLGPUBuffer, WebGLGPUObjectType, WebGLGPUTexture, WebGLGPURenderPass, WebGLGPUFramebuffer, WebGLGPUTextureView, WebGLGPUShader, WebGLGPUShaderStage, WebGLGPUSampler, WebGLGPUInputAssembler, WebGLGPUPipelineState, WebGLGPUPipelineLayout, WebGLGPUBindingLayout as WebGLGPUBindingLayout, WebGLGPUBinding } from './webgl-gpu-objects'; -import { WebGLCmdFuncUpdateBuffer, WebGLCmdFuncDestroyBuffer, WebGLCmdFuncCreateBuffer, WebGLCmdFuncDestroyTexture, WebGLCmdFuncCreateTexture, WebGLCmdFuncCreateFramebuffer, WebGLCmdFuncDestroyFramebuffer, WebGLCmdFuncCreateShader, WebGLCmdFuncDestroyShader, WebGLCmdFuncCreateInputAssember } from './webgl-commands'; +import { WebGLCmdFuncUpdateBuffer, WebGLCmdFuncDestroyBuffer, WebGLCmdFuncCreateBuffer, WebGLCmdFuncDestroyTexture, WebGLCmdFuncCreateTexture, WebGLCmdFuncCreateFramebuffer, WebGLCmdFuncDestroyFramebuffer, WebGLCmdFuncCreateShader, WebGLCmdFuncDestroyShader, WebGLCmdFuncCreateInputAssember, WebGLCmdFuncCopyBufferToTexture2D } from './webgl-commands'; import { GFXTexture, GFXTextureInfo } from '../texture'; import { GFXTextureViewInfo, GFXTextureView } from '../texture-view'; import { GFXRenderPassInfo, GFXRenderPass } from '../render-pass'; @@ -31,7 +31,7 @@ import { WebGLGFXFramebuffer } from './webgl-framebuffer'; import { WebGLGFXInputAssembler } from './webgl-input-assembler'; import { GFXWindow, GFXWindowInfo } from '../window'; import { WebGLGFXWindow } from './webgl-window'; -import { GFXBindingType, GFXFilter, GFXAddress, GFXTextureType, GFXTextureFlagBit, GFXTextureViewType, GFXBufferUsageBit, GFXQueueType, GFXFormat } from '../define'; +import { GFXBindingType, GFXFilter, GFXAddress, GFXTextureType, GFXTextureFlagBit, GFXTextureViewType, GFXBufferUsageBit, GFXQueueType, GFXFormat, GFXBufferTextureCopy, GFXMemoryUsageBit, GFXTextureLayout, GFXTextureSubres, GFXRect } from '../define'; import { WebGLGFXBindingLayout } from './webgl-binding-layout'; const WebGLPrimitives: GLenum[] = [ @@ -377,6 +377,36 @@ export class WebGLGFXDevice extends GFXDevice { public present() { } + public copyBufferToTexture2D(buffer: ArrayBuffer, texture: GFXTexture, rect?: GFXRect) { + + let bufferView = new Uint8Array(buffer); + + let x, y, w, h; + + if(rect !== undefined) { + x = rect.x; + y = rect.y; + w = rect.width; + h = rect.height; + } else { + x = 0; + y = 0; + w = texture.width; + h = texture.height; + } + + let region: GFXBufferTextureCopy = { + buffOffset: 0, + buffStride: 0, + buffTexHeight: 0, + texOffset: { x: x, y: y, z: 0 }, + texExtent: { width: w, height: h, depth: 1 }, + texSubres: new GFXTextureSubres, + }; + + WebGLCmdFuncCopyBufferToTexture2D(this, bufferView, (texture).gpuTexture, [region]); + } + public get gl(): WebGLRenderingContext { return this._webGLRC; } diff --git a/cocos/pipeline/forward/test-stage.ts b/cocos/pipeline/forward/test-stage.ts index 0f57feffd6..2088bf2cde 100644 --- a/cocos/pipeline/forward/test-stage.ts +++ b/cocos/pipeline/forward/test-stage.ts @@ -199,16 +199,6 @@ export class TestStage extends RenderStage { let imgBuffer: ArrayBuffer = imgData.data; //var buffer = image.currentSrc;//arraybuffer object - let stagingBuffer = this._device.createBuffer({ - usage: GFXBufferUsageBit.TRANSFER_SRC, - memUsage: GFXMemoryUsageBit.HOST, - size: imgBuffer.byteLength, - }); - - if (!stagingBuffer) { - return false; - } - this._texture = this._device.createTexture({ type: GFXTextureType.TEX2D, usage: GFXTextureUsageBit.SAMPLED | GFXTextureUsageBit.TRANSFER_DST, @@ -232,17 +222,7 @@ export class TestStage extends RenderStage { return false; } - let region: GFXBufferTextureCopy = new GFXBufferTextureCopy; - region.texExtent.width = this._texture.width; - region.texExtent.height = this._texture.height; - - let cmdBuff = this._cmdBuff; - cmdBuff.begin(); - cmdBuff.updateBuffer(stagingBuffer, imgBuffer); - cmdBuff.copyBufferToTexture(stagingBuffer, this._texture, GFXTextureLayout.TRANSFER_DST_OPTIMAL, [region]); - cmdBuff.end(); - - this._device.queue.submit([cmdBuff]); + this._device.copyBufferToTexture2D(imgBuffer, this._texture); this._sampler = this._device.createSampler({ minFilter: GFXFilter.LINEAR, diff --git a/playground/cubetexture.png b/playground/cubetexture.png new file mode 100644 index 0000000000..078b19a569 Binary files /dev/null and b/playground/cubetexture.png differ