From f834f25794cfb746079e92d58c7410b767c57208 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 14 Jan 2021 15:48:54 -0800 Subject: COM-ify all slang-gfx interfaces. (#1656) * COM-ify all slang-gfx interfaces. --- tools/graphics-app-framework/model.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'tools/graphics-app-framework/model.cpp') diff --git a/tools/graphics-app-framework/model.cpp b/tools/graphics-app-framework/model.cpp index 6a61c64e5..6984a6818 100644 --- a/tools/graphics-app-framework/model.cpp +++ b/tools/graphics-app-framework/model.cpp @@ -97,7 +97,7 @@ namespace std namespace gfx { -RefPtr loadTextureImage( +ComPtr loadTextureImage( IRenderer* renderer, char const* path) { @@ -178,17 +178,17 @@ RefPtr loadTextureImage( int mipCount = (int) mipRowStrides.size(); - TextureResource::Desc desc; - desc.init2D(Resource::Type::Texture2D, format, extentX, extentY, mipCount); + ITextureResource::Desc desc; + desc.init2D(IResource::Type::Texture2D, format, extentX, extentY, mipCount); - TextureResource::Data initData; + ITextureResource::Data initData; initData.numSubResources = mipCount; initData.numMips = mipCount; initData.subResources = &subresourceInitData[0]; initData.mipRowStrides = &mipRowStrides[0]; auto texture = renderer->createTextureResource( - Resource::Usage::PixelShaderResource, + IResource::Usage::PixelShaderResource, desc, &initData); @@ -538,22 +538,22 @@ Result ModelLoader::load( modelData.meshCount = int(meshes.size()); modelData.meshes = meshes.data(); - BufferResource::Desc vertexBufferDesc; + IBufferResource::Desc vertexBufferDesc; vertexBufferDesc.init(modelData.vertexCount * sizeof(Vertex)); - vertexBufferDesc.setDefaults(Resource::Usage::VertexBuffer); + vertexBufferDesc.setDefaults(IResource::Usage::VertexBuffer); modelData.vertexBuffer = renderer->createBufferResource( - Resource::Usage::VertexBuffer, + IResource::Usage::VertexBuffer, vertexBufferDesc, flatVertices.data()); if(!modelData.vertexBuffer) return SLANG_FAIL; - BufferResource::Desc indexBufferDesc; + IBufferResource::Desc indexBufferDesc; indexBufferDesc.init(modelData.indexCount * sizeof(Index)); - vertexBufferDesc.setDefaults(Resource::Usage::IndexBuffer); + vertexBufferDesc.setDefaults(IResource::Usage::IndexBuffer); modelData.indexBuffer = renderer->createBufferResource( - Resource::Usage::IndexBuffer, + IResource::Usage::IndexBuffer, indexBufferDesc, flatIndices.data()); if(!modelData.indexBuffer) return SLANG_FAIL; -- cgit v1.2.3