diff --git a/Dashboard.Media.Defaults/Dashboard.Media.Defaults.csproj b/Dashboard.Media.Defaults/Dashboard.Media.Defaults.csproj index 30508c6..961505b 100644 --- a/Dashboard.Media.Defaults/Dashboard.Media.Defaults.csproj +++ b/Dashboard.Media.Defaults/Dashboard.Media.Defaults.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/Dashboard.sln b/Dashboard.sln index 3d36ba6..2e5e69e 100644 --- a/Dashboard.sln +++ b/Dashboard.sln @@ -9,6 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.Media.Defaults", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.OpenTK", "Dashboard.OpenTK\Dashboard.OpenTK.csproj", "{2013470A-915C-46F2-BDD3-FCAA39C845EE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{40F3B724-88A1-4D4F-93AB-FE0DC07A347E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.Demo", "tests\Dashboard.Demo\Dashboard.Demo.csproj", "{EAA5488E-ADF0-4D68-91F4-FAE98C8691FC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -30,5 +34,12 @@ Global {2013470A-915C-46F2-BDD3-FCAA39C845EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {2013470A-915C-46F2-BDD3-FCAA39C845EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {2013470A-915C-46F2-BDD3-FCAA39C845EE}.Release|Any CPU.Build.0 = Release|Any CPU + {EAA5488E-ADF0-4D68-91F4-FAE98C8691FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EAA5488E-ADF0-4D68-91F4-FAE98C8691FC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EAA5488E-ADF0-4D68-91F4-FAE98C8691FC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EAA5488E-ADF0-4D68-91F4-FAE98C8691FC}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {EAA5488E-ADF0-4D68-91F4-FAE98C8691FC} = {40F3B724-88A1-4D4F-93AB-FE0DC07A347E} EndGlobalSection EndGlobal diff --git a/Dashboard/OpenGL/GL21Driver.cs b/Dashboard/OpenGL/GL21Driver.cs index 21faa50..7e00833 100644 --- a/Dashboard/OpenGL/GL21Driver.cs +++ b/Dashboard/OpenGL/GL21Driver.cs @@ -46,8 +46,8 @@ namespace Dashboard.OpenGL { if (IsInit) return; - int vs = CreateShader(GL_VERTEX_SHADER, "Quik.res.gl21.vert"); - int fs = CreateShader(GL_FRAGMENT_SHADER, "Quik.res.gl21.frag"); + int vs = CreateShader(GL_VERTEX_SHADER, "Dashboard.res.gl21.vert"); + int fs = CreateShader(GL_FRAGMENT_SHADER, "Dashboard.res.gl21.frag"); program = GL.CreateProgram(); GL.AttachShader(program, vs);