projects
/
GPU.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implémentation du raytracing pour Global Memory/Shared Memory/Constant Memory
[GPU.git]
/
WCudaMSE
/
BilatTools_CPP
/
src
/
core
/
tools
/
header
/
namespace_cpu
/
IndiceTools_CPU.h
diff --git
a/WCudaMSE/BilatTools_CPP/src/core/tools/header/namespace_cpu/IndiceTools_CPU.h
b/WCudaMSE/BilatTools_CPP/src/core/tools/header/namespace_cpu/IndiceTools_CPU.h
index
a97f64b
..
1c3027e
100755
(executable)
--- a/
WCudaMSE/BilatTools_CPP/src/core/tools/header/namespace_cpu/IndiceTools_CPU.h
+++ b/
WCudaMSE/BilatTools_CPP/src/core/tools/header/namespace_cpu/IndiceTools_CPU.h
@@
-1,6
+1,8
@@
#ifndef INDICE_TOOLS_CPU_H_
\r
#define INDICE_TOOLS_CPU_H_
\r
\r
#ifndef INDICE_TOOLS_CPU_H_
\r
#define INDICE_TOOLS_CPU_H_
\r
\r
+#include "cudaType_CPU.h"
\r
+
\r
/*----------------------------------------------------------------------*\
\r
|* Declaration *|
\r
\*---------------------------------------------------------------------*/
\r
/*----------------------------------------------------------------------*\
\r
|* Declaration *|
\r
\*---------------------------------------------------------------------*/
\r
@@
-29,12
+31,17
@@
namespace cpu
/**
\r
* s[0,W*H[ --> i[0,H[ j[0,W[
\r
*/
\r
/**
\r
* s[0,W*H[ --> i[0,H[ j[0,W[
\r
*/
\r
- static void toIJ(int s, int W, int* ptri, int* ptrj);
\r
+ static void toIJ(int s, int w, int* ptri, int* ptrj);
\r
+
\r
+ /**
\r
+ * s[0,W*H[ --> x[0,W[ y[0,H[
\r
+ */
\r
+ static float2 toPixelFloat(int s, int w);
\r
\r
/**
\r
* i[0,H[ j[0,W[ --> s[0,W*H[
\r
*/
\r
\r
/**
\r
* i[0,H[ j[0,W[ --> s[0,W*H[
\r
*/
\r
- static int toS(int
W
, int i, int j);
\r
+ static int toS(int
w
, int i, int j);
\r
\r
/*-------------------------------------*\
\r
|* Attributs *|
\r
\r
/*-------------------------------------*\
\r
|* Attributs *|
\r