Commit c6369b51 authored by Brian's avatar Brian

delete createcompute duplication

-also added some papers
-comment checklinked for compute shader since it's not ready yet
parent 9b7549a3
 glCalls.cpp
mm_raytracer.vcxproj -> C:\Users\eleph\Documents\GitHub\mm_raytracer\VisualStudio\Debug\mm_raytracer.exe
 mm_raytracer.cpp
glCalls.cpp
Code wird generiert...
glad.c
LINK : C:\Users\brian\Desktop\Multimedia\mm_raytracer\VisualStudio\Debug\mm_raytracer.exe wurde nicht gefunden oder beim letzten inkrementellen Linkvorgang nicht erstellt; vollständiger Link wird durchgeführt.
LINK : fatal error LNK1104: Datei "C:\Users\brian\Desktop\Multimedia\mm_raytracer\VisualStudio\Debug\mm_raytracer.exe" kann nicht geöffnet werden.
B^C:\USERS\ELEPH\SOURCE\REPOS\MM_RAYTRACER\MM_RAYTRACER\MM_RAYTRACER.CPP
......
B^C:\USERS\ELEPH\DOCUMENTS\GITHUB\MM_RAYTRACER\VISUALSTUDIO\MM_RAYTRACER\SRC\GLAD.C
......
B^C:\USERS\ELEPH\DOCUMENTS\GITHUB\MM_RAYTRACER\SRC\GLCALLS.CPP|C:\USERS\ELEPH\DOCUMENTS\GITHUB\MM_RAYTRACER\VISUALSTUDIO\MM_RAYTRACER\MM_RAYTRACER.CPP
......
#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0
Debug|Win32|C:\Users\eleph\Documents\GitHub\mm_raytracer\VisualStudio\|
Debug|Win32|C:\Users\brian\Desktop\Multimedia\mm_raytracer\VisualStudio\|
......@@ -151,10 +151,12 @@ namespace rt
// attach shaders to program object
glAttachShader(computeProgramObject, computeShader);
/*
if (!checkLinkedProgram(computeProgramObject))
{
return GL_FALSE;
}
*/
userData->programObjectCompute = computeProgramObject;
......@@ -165,15 +167,6 @@ namespace rt
delete(vertexShaderSource);
/*
//Create the vertex shader:
char* computeShaderSource = readShaderFromFile("shader/compute.glsl");
GLuint computeShader = compileShader(GL_COMPUTE_SHADER, computeShaderSource, "compute shader");
delete(computeShaderSource);
*/
//Create the fragment shader:
char* fragmentShaderSource = readShaderFromFile((char*)"shader/fragment.glsl");
......
http://antongerdelan.net/opengl/compute.html
\ No newline at end of file
https://github.com/LWJGL/lwjgl3-wiki/wiki/2.6.1.-Ray-tracing-with-OpenGL-Compute-Shaders-%28Part-I%29
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment