directx/dx10/shader.hpp: テスト＆ちょい直し

diff --git a/roast_ex/include/roast/graphics/directx/dx10/shader.hpp b/roast_ex/include/roast/graphics/directx/dx10/shader.hpp
index 81322b1..eee546c 100644 (file)
--- a/roast_ex/include/roast/graphics/directx/dx10/shader.hpp
+++ b/roast_ex/include/roast/graphics/directx/dx10/shader.hpp
@@ -83,7 +83,7 @@ namespace roast
                                        enum exception_codes
                                        {
                                                exception_codes__head = exception_code_root::technique,
-                                               get_pass_Failed
+                                               get_pass__Unknown_pass
                                        };
                                protected:
                                        d3dtechnique* m_if;
@@ -93,7 +93,7 @@ namespace roast
                                        pass get_pass(const char* name){
                                                d3dpass* ps = m_if->GetPassByName(name);
                                                if ( ps == NULL ){
-                                                       throw exception(get_pass_Failed,
+                                                       throw exception(get_pass__Unknown_pass,
                                                                ::std::string("GetPassByName() unknown pass ")+name);
                                                }
                                                return pass(ps);
@@ -110,7 +110,7 @@ namespace roast
                                                exception_codes__head = exception_code_root::effect,
 
                                                effect_D3DX10CreateEffectFromFile_Failed,
-                                               get_technique_Failed
+                                               get_technique__Unknown_technique
                                        };
 
                                        /// Constructor Param //////////////////////////////////////
@@ -247,7 +247,7 @@ namespace roast
                                        {
                                                d3dtechnique* d3dtech = m_if->GetTechniqueByName(name);
                                                if ( d3dtech == NULL ){
-                                                       throw exception(get_technique_Failed,
+                                                       throw exception(get_technique__Unknown_technique,
                                                                ::std::string("GetTechniqueByName() unknown technique ")+name);
                                                }
                                                return technique(d3dtech);

diff --git a/roast_ex/test/dx9_test/dx9_test.cpp b/roast_ex/test/dx9_test/dx9_test.cpp
index 62c30ee..220dd9e 100644 (file)
--- a/roast_ex/test/dx9_test/dx9_test.cpp
+++ b/roast_ex/test/dx9_test/dx9_test.cpp
@@ -86,9 +86,11 @@ struct MyVertex {
                graphics::input_vertex_buffer<MyVertex> ivb(d, vtx, sizeof(vtx));
                graphics::render_device ren(d);
                ren.set_vertex_buffer(ivb);
-               graphics::effect ef1(d,
+               graphics::effect efx(d,
                        graphics::effect::construct_by_file("MyShader.fx"),
                        shader_model<shader_model_type::fx,4>() );
+               graphics::technique tc = efx.get_technique("SimpleRender");
+               graphics::pass ps = tc.get_pass("P0");
 
                //ren.draw_primitive(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3);