projects
/
GPU.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TP Saucisson.
[GPU.git]
/
WCudaMSE
/
Student_Cuda_Image
/
src
/
cpp
/
core
/
04_RayTracing
/
moo
/
device
/
RayTracingDevice.cu
diff --git
a/WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/RayTracingDevice.cu
b/WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/RayTracingDevice.cu
index
368e469
..
3d80bc4
100644
(file)
--- a/
WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/RayTracingDevice.cu
+++ b/
WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/RayTracingDevice.cu
@@
-8,17
+8,14
@@
using namespace std;
#include "Device.h"
#include "RayTracingDevice.h"
#include "Device.h"
#include "RayTracingDevice.h"
-#include "RayTracingMath.h"
__global__
__global__
-void rayTracing(uchar4* ptrDevPixels, int w, int h,
DomaineMath domaineMath,
float t)
+void rayTracing(uchar4* ptrDevPixels, int w, int h, float t)
{
const int TID = Indice2D::tid();
const int NB_THREAD = Indice2D::nbThread();
const int WH = w * h;
{
const int TID = Indice2D::tid();
const int NB_THREAD = Indice2D::nbThread();
const int WH = w * h;
- RayTracingMath rayTracing; // TODO: prendre
-
uchar4 color;
color.w = 255; // Par défaut, l'image est opaque.
uchar4 color;
color.w = 255; // Par défaut, l'image est opaque.