diff --git a/CMCore b/CMCore index 072153aa..416e96c1 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 072153aa9135d7de413cc9d63e3019e9853d7045 +Subproject commit 416e96c16923dede9dba5a483e1fe239116e8679 diff --git a/example/Vulkan/fourth_triangle.cpp b/example/Vulkan/fourth_triangle.cpp index 252a0c74..fb4e395e 100644 --- a/example/Vulkan/fourth_triangle.cpp +++ b/example/Vulkan/fourth_triangle.cpp @@ -78,7 +78,7 @@ private: return pipeline; } - bool InitVBO() + bool InitVBOAndRenderList() { RenderablePrimitiveCreater rpc(db,VERTEX_COUNT); @@ -118,7 +118,7 @@ public: if(!InitMaterial()) return(false); - if(!InitVBO()) + if(!InitVBOAndRenderList()) return(false); BuildCommandBuffer(render_list); diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index 0a17318b..7c36ae86 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -21,10 +21,10 @@ constexpr uint32_t SCREEN_HEIGHT=256; constexpr float position_data[4]= { - -1, //left - -1, //top + 0, //left + 0, //top 1, //right - 1 //bottom; + 1 //bottom }; constexpr float tex_coord_data[4]= @@ -49,7 +49,7 @@ private: { mtl::Material2DCreateConfig cfg(device->GetDeviceAttribute(),"RectTexture2D"); - cfg.coordinate_system=CoordinateSystem2D::NDC; + cfg.coordinate_system=CoordinateSystem2D::ZeroToOne; cfg.local_to_world=false; AutoDelete mci=mtl::CreateRectTexture2D(&cfg); diff --git a/res b/res index dcb47143..008dbd53 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit dcb47143e5ff4e070bec7db33d35b15b7f0f82f7 +Subproject commit 008dbd5353e6afe7add287333cbda1b5c5fffdec diff --git a/src/ShaderGen/common/MFRectPrimitive.h b/src/ShaderGen/common/MFRectPrimitive.h index 2822b6fd..db04a9a6 100644 --- a/src/ShaderGen/common/MFRectPrimitive.h +++ b/src/ShaderGen/common/MFRectPrimitive.h @@ -17,7 +17,7 @@ vec4 GetPosition2D() R"( vec4 GetPosition2D() { - return vec4(Position.xy*2-1,Position.zw*2-1); + return Position*2-1; } )",