Merge branch 'master' of https://github.com/gkernel/cuda_lab

.gitignore

@@ -6,8 +6,5 @@ image_result.png
 *.project
 *.settings
 *.settings/*
-miklos/sample_qt_opengl_cuda_shit_without_camera/moc_glwidget.cpp
-miklos/sample_qt_opengl_cuda_shit_without_camera/Makefile
-miklos/sample_qt_opengl_cuda_shit_without_camera/hello-opengl
+moc_*.cpp
 *.o
-

miklos/project_integration/hello-opengl.pro → miklos/project_integration/cuda-project.pro

 QT += core gui opengl
 CONFIG += debug
 
-TARGET = hello-opengl
+TARGET = main
 
 TEMPLATE = app
 

miklos/project_integration/glwidget.h

@@ -12,7 +12,6 @@ public:
     explicit GlWidget(QWidget *parent = 0);
     ~GlWidget();
     QSize sizeHint() const;
-    float *d_in;
 
 protected:
     void initializeGL();
@@ -20,6 +19,7 @@ protected:
 
 private:
     QGLFunctions gl;
+    float *d_in;
 };
 
 #endif // GLWIDGET_H

miklos/project_integration/kernel.cu

@@ -107,7 +107,7 @@ inline dim3 make_grid(dim3 whole, dim3 block)
 static float *d_T, *d_F, *d_Xi, *d_Xj;
 
 
-void allocate_device_memory(float *d_in, size_t w, size_t h)
+void allocate_device_memory(size_t w, size_t h)
 {
 	size_t imageBytes = w*h*sizeof(float);
 	cudaMalloc(&d_T, imageBytes);

miklos/project_integration/kernel.h

 #ifndef KERNEL_H
 #define KERNEL_H
 
-extern "C" void allocate_device_memory(float *d_in, size_t width, size_t height);
+extern "C" void allocate_device_memory(size_t width, size_t height);
 extern "C" void executeKernel(float *d_in, void *d_out, size_t width, size_t height);
 
 #endif // KERNEL_H

miklos/project_integration/main.cpp

@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
     }
 
     QObject::connect(&camera, SIGNAL(newFrame()), &w, SLOT(updateGL()));
-    allocate_device_memory(w.d_in, camera.width(), camera.height());
+    allocate_device_memory(camera.width(), camera.height());
 
     camera.start();
     w.show();