From fe9b9bfc1357899690fc676c0135947b93c7fce2 Mon Sep 17 00:00:00 2001 From: rachytski Date: Fri, 30 Nov 2012 11:22:33 +0300 Subject: [PATCH] minor fixes --- graphics/graphics.pro | 6 ++++-- graphics/vertex_decl.cpp | 6 ++++-- graphics/vertex_decl.hpp | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/graphics/graphics.pro b/graphics/graphics.pro index 14bb00d442..3295d5f1a3 100644 --- a/graphics/graphics.pro +++ b/graphics/graphics.pro @@ -66,7 +66,8 @@ SOURCES += \ data_formats.cpp \ image_info.cpp \ image_renderer.cpp \ - display_list_renderer.cpp + display_list_renderer.cpp \ + vertex_decl.cpp \ render_context.cpp \ coordinates.cpp \ render_target.cpp \ @@ -129,7 +130,8 @@ HEADERS += \ display_list.hpp \ image_renderer.hpp \ image_info.hpp \ - display_list_renderer.hpp + display_list_renderer.hpp \ + vertex_decl.hpp \ render_context.hpp \ coordinates.hpp \ diff --git a/graphics/vertex_decl.cpp b/graphics/vertex_decl.cpp index ba0eb6f0ae..3c3a90ee12 100644 --- a/graphics/vertex_decl.cpp +++ b/graphics/vertex_decl.cpp @@ -2,14 +2,16 @@ namespace graphics { - VertexAttrib::VertexAttrib(size_t offset, + VertexAttrib::VertexAttrib(char const * name, + size_t offset, EDataType elemType, size_t elemCount, size_t stride) : m_offset(offset), m_elemType(elemType), m_elemCount(elemCount), - m_stride(stride) + m_stride(stride), + m_name(name) {} VertexDecl::VertexDecl(VertexAttrib const * attrs, size_t cnt) diff --git a/graphics/vertex_decl.hpp b/graphics/vertex_decl.hpp index f71a4a2985..9ed75f527d 100644 --- a/graphics/vertex_decl.hpp +++ b/graphics/vertex_decl.hpp @@ -16,7 +16,8 @@ namespace graphics size_t m_stride; string m_name; - VertexAttrib(size_t offset, + VertexAttrib(char const * name, + size_t offset, EDataType elemType, size_t elemCount, size_t stride);