Merge pull request cocos#52 from YunHsiao/gfx

fix build
JoneLau · Jan 15, 2019 · e25a002 · e25a002
2 parents 54d2423 + 4d30e1b
commit e25a002
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/cocos/assets/render-texture.ts b/cocos/assets/render-texture.ts
@@ -4,7 +4,7 @@ import { GFXFormat, GFXTextureType, GFXTextureUsageBit, GFXTextureViewType } fro
 import { GFXFramebuffer } from '../gfx/framebuffer';
 import { GFXTexture } from '../gfx/texture';
 import { GFXTextureView } from '../gfx/texture-view';
-import { RenderPassStage } from '../pipeline/render-pipeline';
+import { RenderPassStage } from '../pipeline/define';
 import ImageAsset from './image-asset';
 import Texture2D from './texture-2d';
 

diff --git a/cocos/pipeline/forward/forward-pipeline.ts b/cocos/pipeline/forward/forward-pipeline.ts
@@ -1,7 +1,8 @@
 import { Root } from '../../core/root';
 import { GFXBufferUsageBit, GFXMemoryUsageBit } from '../../gfx/define';
 import { GFXRenderPass } from '../../gfx/render-pass';
-import { RenderPassStage, RenderPipeline, UBOGlobal } from '../render-pipeline';
+import { RenderPassStage } from '../define';
+import { RenderPipeline, UBOGlobal } from '../render-pipeline';
 import { ForwardFlow } from './forward-flow';
 
 export enum ForwardFlowPriority {

diff --git a/cocos/renderer/core/effect.ts b/cocos/renderer/core/effect.ts
@@ -4,7 +4,7 @@ import { EffectAsset, IShaderInfo } from '../../3d/assets/effect-asset';
 import { CCObject } from '../../core/data';
 import { Color, Mat4, Vec2, Vec3, Vec4 } from '../../core/value-types';
 import { GFXType } from '../../gfx/define';
-import { RenderPassStage } from '../../pipeline/render-pipeline';
+import { RenderPassStage } from '../../pipeline/define';
 import Texture2D from '../gfx/texture-2d';
 import TextureCube from '../gfx/texture-cube';
 import { IPassInfoFull, Pass } from './pass';

diff --git a/cocos/renderer/core/pass.ts b/cocos/renderer/core/pass.ts
@@ -13,7 +13,8 @@ import { GFXRenderPass } from '../../gfx/render-pass';
 import { GFXSampler } from '../../gfx/sampler';
 import { GFXShader } from '../../gfx/shader';
 import { GFXTextureView } from '../../gfx/texture-view';
-import { RenderPassStage, UBOGlobal, UBOLocal } from '../../pipeline/render-pipeline';
+import { RenderPassStage } from '../../pipeline/define';
+import { UBOGlobal, UBOLocal } from '../../pipeline/render-pipeline';
 
 export interface IPassInfoFull extends IPassInfo {
     // generated part