diff --git a/.gitignore b/.gitignore index 5bb54fc2..ecadee0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*.pcu +*.pcu *.pdb *.exe 0.pas diff --git a/.gitmodules b/.gitmodules index 986c5ace..aa5ac52e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ - + [submodule "DataScraping/Reps/OpenCL-Docs"] diff --git a/DataScraping/XML/OpenCL/vendors.dat b/DataScraping/XML/OpenCL/vendors.dat index 9df30eb4..e9894aac 100644 --- a/DataScraping/XML/OpenCL/vendors.dat +++ b/DataScraping/XML/OpenCL/vendors.dat @@ -1,4 +1,4 @@ - + Khronos = KHR diff --git a/DataScraping/XML/OpenGL/vendors.dat b/DataScraping/XML/OpenGL/vendors.dat index d4a03bb5..061002d3 100644 --- a/DataScraping/XML/OpenGL/vendors.dat +++ b/DataScraping/XML/OpenGL/vendors.dat @@ -1,4 +1,4 @@ - + KHR = KHR diff --git a/DeleteAllTemp.bat b/DeleteAllTemp.bat index dcc538ac..b4ec70ca 100644 --- a/DeleteAllTemp.bat +++ b/DeleteAllTemp.bat @@ -1,4 +1,4 @@ - + del /S *.pcu diff --git a/LICENSE b/LICENSE index cf1ab25d..2e51ddd6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -This is free and unencumbered software released into the public domain. +This is free and unencumbered software released into the public domain. Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled diff --git a/PackAll-0 Just First Pack.bat b/PackAll-0 Just First Pack.bat index c5ea019a..fd9192cc 100644 --- a/PackAll-0 Just First Pack.bat +++ b/PackAll-0 Just First Pack.bat @@ -1,4 +1,4 @@ -@setlocal enableextensions +@setlocal enableextensions @cd /d "%~dp0" diff --git a/PackAll-1 CL+GL.bat b/PackAll-1 CL+GL.bat index d48e1c64..85cba45a 100644 --- a/PackAll-1 CL+GL.bat +++ b/PackAll-1 CL+GL.bat @@ -1,4 +1,4 @@ -@setlocal enableextensions +@setlocal enableextensions @cd /d "%~dp0" diff --git a/PackAll-2 CLABC Full.bat b/PackAll-2 CLABC Full.bat index 70aa4119..c92ff893 100644 --- a/PackAll-2 CLABC Full.bat +++ b/PackAll-2 CLABC Full.bat @@ -1,4 +1,4 @@ -@setlocal enableextensions +@setlocal enableextensions @cd /d "%~dp0" diff --git a/PackAll-2 GLABC Full.bat b/PackAll-2 GLABC Full.bat index 01d771ec..0e277af8 100644 --- a/PackAll-2 GLABC Full.bat +++ b/PackAll-2 GLABC Full.bat @@ -1,4 +1,4 @@ -@setlocal enableextensions +@setlocal enableextensions @cd /d "%~dp0" diff --git a/PackAll-3 CLABC Only.bat b/PackAll-3 CLABC Only.bat index 65f5a401..31cce52e 100644 --- a/PackAll-3 CLABC Only.bat +++ b/PackAll-3 CLABC Only.bat @@ -1,4 +1,4 @@ -@setlocal enableextensions +@setlocal enableextensions @cd /d "%~dp0" diff --git a/PackAll-3 GLABC Only.bat b/PackAll-3 GLABC Only.bat index 45b81d4b..5d3c39cc 100644 --- a/PackAll-3 GLABC Only.bat +++ b/PackAll-3 GLABC Only.bat @@ -1,4 +1,4 @@ -@setlocal enableextensions +@setlocal enableextensions @cd /d "%~dp0" diff --git a/PackAll-4 Release Only.bat b/PackAll-4 Release Only.bat index b2faf958..758a5e98 100644 --- a/PackAll-4 Release Only.bat +++ b/PackAll-4 Release Only.bat @@ -1,4 +1,4 @@ -@setlocal enableextensions +@setlocal enableextensions @cd /d "%~dp0" diff --git a/Packing/Descriptions/0Common/0.dat b/Packing/Descriptions/0Common/0.dat index 30c57a33..b52f8af1 100644 --- a/Packing/Descriptions/0Common/0.dat +++ b/Packing/Descriptions/0Common/0.dat @@ -1,4 +1,4 @@ - + # PlatformLoader diff --git a/Packing/Descriptions/Dummy/0.dat b/Packing/Descriptions/Dummy/0.dat index e27ca91d..5a41b22e 100644 --- a/Packing/Descriptions/Dummy/0.dat +++ b/Packing/Descriptions/Dummy/0.dat @@ -1,4 +1,4 @@ - + # EnumBase diff --git a/Packing/Descriptions/OpenCL/0.dat b/Packing/Descriptions/OpenCL/0.dat index a590f5f5..80c3161a 100644 --- a/Packing/Descriptions/OpenCL/0.dat +++ b/Packing/Descriptions/OpenCL/0.dat @@ -1,4 +1,4 @@ - + # OpenCLException diff --git a/Packing/Descriptions/OpenCL/IdClass.dat b/Packing/Descriptions/OpenCL/IdClass.dat index 25abf7e9..dcc61436 100644 --- a/Packing/Descriptions/OpenCL/IdClass.dat +++ b/Packing/Descriptions/OpenCL/IdClass.dat @@ -1,4 +1,4 @@ - + # cl_accelerator diff --git a/Packing/Descriptions/OpenGL/0.dat b/Packing/Descriptions/OpenGL/0.dat index cbc9ff2a..0fc33bf2 100644 --- a/Packing/Descriptions/OpenGL/0.dat +++ b/Packing/Descriptions/OpenGL/0.dat @@ -1,4 +1,4 @@ - + # PlWin diff --git a/Packing/Descriptions/OpenGL/IdClass.dat b/Packing/Descriptions/OpenGL/IdClass.dat index c81f9e90..1b5774cd 100644 --- a/Packing/Descriptions/OpenGL/IdClass.dat +++ b/Packing/Descriptions/OpenGL/IdClass.dat @@ -1,4 +1,4 @@ - + # gl_buffer diff --git a/Packing/Descriptions/OpenGLABC/EMPTY b/Packing/Descriptions/OpenGLABC/EMPTY index e69de29b..5f282702 100644 --- a/Packing/Descriptions/OpenGLABC/EMPTY +++ b/Packing/Descriptions/OpenGLABC/EMPTY @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Packing/Reference/.gitignore b/Packing/Reference/.gitignore index 8eca9e2d..55eb0259 100644 --- a/Packing/Reference/.gitignore +++ b/Packing/Reference/.gitignore @@ -1 +1 @@ -/Markdig.dll +/Markdig.dll diff --git a/Packing/Reference/0Release/Common/0.css b/Packing/Reference/0Release/Common/0.css index 79b78b31..cbbc53c7 100644 --- a/Packing/Reference/0Release/Common/0.css +++ b/Packing/Reference/0Release/Common/0.css @@ -1,4 +1,4 @@ - + /* ============================== *\ diff --git a/Packing/Reference/split.bat b/Packing/Reference/split.bat index 4d1d3a4d..d67886c4 100644 --- a/Packing/Reference/split.bat +++ b/Packing/Reference/split.bat @@ -1 +1 @@ -git subtree split --prefix="Packing/Reference/0Release" -b gh-pages \ No newline at end of file +git subtree split --prefix="Packing/Reference/0Release" -b gh-pages \ No newline at end of file diff --git a/Packing/Template/Common/LicenseHeader.txt b/Packing/Template/Common/LicenseHeader.txt index 23e7ee75..82b5d059 100644 --- a/Packing/Template/Common/LicenseHeader.txt +++ b/Packing/Template/Common/LicenseHeader.txt @@ -1,4 +1,4 @@ - + {%%} diff --git a/Packing/Template/HighLvl/OpenCLABC/!Def/ContainerMethods/Syntax.md b/Packing/Template/HighLvl/OpenCLABC/!Def/ContainerMethods/Syntax.md index 2fd716b1..ede4eab0 100644 --- a/Packing/Template/HighLvl/OpenCLABC/!Def/ContainerMethods/Syntax.md +++ b/Packing/Template/HighLvl/OpenCLABC/!Def/ContainerMethods/Syntax.md @@ -1,4 +1,4 @@ - + ``` diff --git a/Packing/Template/LowLvl/Fixers/Delegate/OpenCL/names.dat b/Packing/Template/LowLvl/Fixers/Delegate/OpenCL/names.dat index 0dde3652..3ddb5394 100644 --- a/Packing/Template/LowLvl/Fixers/Delegate/OpenCL/names.dat +++ b/Packing/Template/LowLvl/Fixers/Delegate/OpenCL/names.dat @@ -1,4 +1,4 @@ - + # cl::EnqueueSvmFreeCallback diff --git a/Packing/Template/LowLvl/Fixers/Delegate/OpenGL/names.dat b/Packing/Template/LowLvl/Fixers/Delegate/OpenGL/names.dat index 135c0221..d7591325 100644 --- a/Packing/Template/LowLvl/Fixers/Delegate/OpenGL/names.dat +++ b/Packing/Template/LowLvl/Fixers/Delegate/OpenGL/names.dat @@ -1,4 +1,4 @@ - + # gl::DEBUGPROC[%vendor:,+AMD,+ARB,+KHR%] diff --git a/Packing/Template/LowLvl/Fixers/Delegate/ReadMe.md b/Packing/Template/LowLvl/Fixers/Delegate/ReadMe.md index 1ec910e4..c28ebbf4 100644 --- a/Packing/Template/LowLvl/Fixers/Delegate/ReadMe.md +++ b/Packing/Template/LowLvl/Fixers/Delegate/ReadMe.md @@ -1,4 +1,4 @@ - + # Change types: diff --git a/Packing/Template/LowLvl/Fixers/Func/OpenCL/cl_ext_image_requirements_info.dat b/Packing/Template/LowLvl/Fixers/Func/OpenCL/cl_ext_image_requirements_info.dat index 12f4919a..265d8f46 100644 --- a/Packing/Template/LowLvl/Fixers/Func/OpenCL/cl_ext_image_requirements_info.dat +++ b/Packing/Template/LowLvl/Fixers/Func/OpenCL/cl_ext_image_requirements_info.dat @@ -1,4 +1,4 @@ - + # cl::GetImageRequirementsInfo+EXT diff --git a/Packing/Template/LowLvl/Fixers/Func/OpenCL/enum type control.dat b/Packing/Template/LowLvl/Fixers/Func/OpenCL/enum type control.dat index d33e96d4..2378e37d 100644 --- a/Packing/Template/LowLvl/Fixers/Func/OpenCL/enum type control.dat +++ b/Packing/Template/LowLvl/Fixers/Func/OpenCL/enum type control.dat @@ -1,4 +1,4 @@ - + # cl::CreateBuffer diff --git a/Packing/Template/LowLvl/Fixers/Func/OpenGL/!EXT/GLX_EXT_import_context.dat b/Packing/Template/LowLvl/Fixers/Func/OpenGL/!EXT/GLX_EXT_import_context.dat index bedf374f..29d8c5d9 100644 --- a/Packing/Template/LowLvl/Fixers/Func/OpenGL/!EXT/GLX_EXT_import_context.dat +++ b/Packing/Template/LowLvl/Fixers/Func/OpenGL/!EXT/GLX_EXT_import_context.dat @@ -1,4 +1,4 @@ - + # glx::GetContextID+EXT diff --git a/Packing/Template/LowLvl/Fixers/Func/ReadMe.md b/Packing/Template/LowLvl/Fixers/Func/ReadMe.md index dc6905da..c880466f 100644 --- a/Packing/Template/LowLvl/Fixers/Func/ReadMe.md +++ b/Packing/Template/LowLvl/Fixers/Func/ReadMe.md @@ -1,4 +1,4 @@ - + # Change types: diff --git a/Packing/Template/LowLvl/Fixers/Group/ReadMe.md b/Packing/Template/LowLvl/Fixers/Group/ReadMe.md index 377454e7..abfb88f1 100644 --- a/Packing/Template/LowLvl/Fixers/Group/ReadMe.md +++ b/Packing/Template/LowLvl/Fixers/Group/ReadMe.md @@ -1,4 +1,4 @@ - + # Change types: diff --git a/Packing/Template/LowLvl/Fixers/IdClass/OpenCL/d3d.dat b/Packing/Template/LowLvl/Fixers/IdClass/OpenCL/d3d.dat index 8fc05cdb..5935bce1 100644 --- a/Packing/Template/LowLvl/Fixers/IdClass/OpenCL/d3d.dat +++ b/Packing/Template/LowLvl/Fixers/IdClass/OpenCL/d3d.dat @@ -1,4 +1,4 @@ - + # d3d::surface9 diff --git a/Packing/Template/LowLvl/Fixers/IdClass/OpenCL/va.dat b/Packing/Template/LowLvl/Fixers/IdClass/OpenCL/va.dat index 6d4f71a4..d5905322 100644 --- a/Packing/Template/LowLvl/Fixers/IdClass/OpenCL/va.dat +++ b/Packing/Template/LowLvl/Fixers/IdClass/OpenCL/va.dat @@ -1,4 +1,4 @@ - + # va::surface_id diff --git a/Packing/Template/LowLvl/Fixers/IdClass/ReadMe.md b/Packing/Template/LowLvl/Fixers/IdClass/ReadMe.md index 2d886116..07d2253e 100644 --- a/Packing/Template/LowLvl/Fixers/IdClass/ReadMe.md +++ b/Packing/Template/LowLvl/Fixers/IdClass/ReadMe.md @@ -1,4 +1,4 @@ - + # Change types: diff --git a/Packing/Template/LowLvl/Fixers/ReadMe.md b/Packing/Template/LowLvl/Fixers/ReadMe.md index 9025fe4e..32474501 100644 --- a/Packing/Template/LowLvl/Fixers/ReadMe.md +++ b/Packing/Template/LowLvl/Fixers/ReadMe.md @@ -1,4 +1,4 @@ - + Genral syntax of `.dat` files: ``` # ItemName diff --git a/Packing/Template/LowLvl/Fixers/Struct/ReadMe.md b/Packing/Template/LowLvl/Fixers/Struct/ReadMe.md index 3bc7e00c..584eff4a 100644 --- a/Packing/Template/LowLvl/Fixers/Struct/ReadMe.md +++ b/Packing/Template/LowLvl/Fixers/Struct/ReadMe.md @@ -1,4 +1,4 @@ - + # Change types: diff --git a/Packing/Template/LowLvl/OpenGL/MiscInput/TypeSizes.dat b/Packing/Template/LowLvl/OpenGL/MiscInput/TypeSizes.dat index 9889071b..7efea69a 100644 --- a/Packing/Template/LowLvl/OpenGL/MiscInput/TypeSizes.dat +++ b/Packing/Template/LowLvl/OpenGL/MiscInput/TypeSizes.dat @@ -1,4 +1,4 @@ - + # 1 diff --git a/README.md b/README.md index fbe742e8..e6343983 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + # POCGL diff --git a/Samples/.gitignore b/Samples/.gitignore deleted file mode 100644 index e467a266..00000000 --- a/Samples/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -OpenCL.pas -OpenCLABC.pas -OpenCLABCBase.pas -OpenGL.pas -OpenGLABC.pas -OpenGLABCBase.pas diff --git "a/Samples/OpenCLABC/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214.cl" "b/Samples/OpenCLABC/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214.cl" index c1000222..cb83d1da 100644 --- "a/Samples/OpenCLABC/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214.cl" +++ "b/Samples/OpenCLABC/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214.cl" @@ -1,4 +1,4 @@ - + #define ValAt(B,X,Y) (B)[((X)+W)%W + ((Y)+W)%W * W] @@ -19,9 +19,6 @@ __kernel void CalcStep(__global uchar* B, __global uchar* B_temp, int W) c += ValAt(B, X+dx, Y+dy); uchar prev_alive = ValAt(B, X, Y); - // Пока не смог заставить работать, поэтому нужен отдельный буфер B_temp... - //work_group_barrier(CLK_LOCAL_MEM_FENCE); - ValAt(B_temp, X, Y) = min_max_neighbours[prev_alive][0]<=c && c<=min_max_neighbours[prev_alive][1]; } diff --git "a/Samples/OpenCLABC/\320\232\320\265\321\210\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265 CLProgramCode/.gitignore" "b/Samples/OpenCLABC/\320\232\320\265\321\210\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265 CLProgramCode/.gitignore" index 93d10c0a..0580f4e8 100644 --- "a/Samples/OpenCLABC/\320\232\320\265\321\210\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265 CLProgramCode/.gitignore" +++ "b/Samples/OpenCLABC/\320\232\320\265\321\210\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265 CLProgramCode/.gitignore" @@ -1 +1 @@ -*.cache +*.cache diff --git "a/Samples/OpenGLABC/!\320\232\321\200\321\203\321\202\321\217\321\211\320\270\320\271\321\201\321\217 \321\202\321\200\320\265\321\203\320\263\320\276\320\273\321\214\320\275\320\270\320\272/\320\232\321\200\321\203\321\202\321\217\321\211\320\270\320\271\321\201\321\217 \321\202\321\200\320\265\321\203\320\263\320\276\320\273\321\214\320\275\320\270\320\272.vert" "b/Samples/OpenGLABC/!\320\232\321\200\321\203\321\202\321\217\321\211\320\270\320\271\321\201\321\217 \321\202\321\200\320\265\321\203\320\263\320\276\320\273\321\214\320\275\320\270\320\272/\320\232\321\200\321\203\321\202\321\217\321\211\320\270\320\271\321\201\321\217 \321\202\321\200\320\265\321\203\320\263\320\276\320\273\321\214\320\275\320\270\320\272.vert" index 04bc7cfd..116388e6 100644 --- "a/Samples/OpenGLABC/!\320\232\321\200\321\203\321\202\321\217\321\211\320\270\320\271\321\201\321\217 \321\202\321\200\320\265\321\203\320\263\320\276\320\273\321\214\320\275\320\270\320\272/\320\232\321\200\321\203\321\202\321\217\321\211\320\270\320\271\321\201\321\217 \321\202\321\200\320\265\321\203\320\263\320\276\320\273\321\214\320\275\320\270\320\272.vert" +++ "b/Samples/OpenGLABC/!\320\232\321\200\321\203\321\202\321\217\321\211\320\270\320\271\321\201\321\217 \321\202\321\200\320\265\321\203\320\263\320\276\320\273\321\214\320\275\320\270\320\272/\320\232\321\200\321\203\321\202\321\217\321\211\320\270\320\271\321\201\321\217 \321\202\321\200\320\265\321\203\320\263\320\276\320\273\321\214\320\275\320\270\320\272.vert" @@ -1,4 +1,4 @@ -#version 460 +#version 460 in vec2 position; in vec3 color; diff --git "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/Empty.vert" "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/Empty.vert" index 2116abbc..93807995 100644 --- "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/Empty.vert" +++ "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/Empty.vert" @@ -1,4 +1,4 @@ -#version 460 core +#version 460 core // Ничего не делаем // Какую точку передали - такую и вернёт diff --git "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/Mandelbrot.frag" "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/Mandelbrot.frag" index c7992211..ca17636b 100644 --- "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/Mandelbrot.frag" +++ "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/Mandelbrot.frag" @@ -1,4 +1,4 @@ -#version 460 core +#version 460 core // Подсматривал сюда: // https://stackoverflow.com/questions/44354589/optimizing-mandelbrot-fractal diff --git "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/SinglePointToScreen.geom" "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/SinglePointToScreen.geom" index 6e3a37fb..116e331f 100644 --- "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/SinglePointToScreen.geom" +++ "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/SinglePointToScreen.geom" @@ -1,4 +1,4 @@ -#version 460 core +#version 460 core layout(points) in; layout(triangle_strip, max_vertices = 4) out; diff --git "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\222\320\276\320\273\320\275\321\213.frag" "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\222\320\276\320\273\320\275\321\213.frag" index 4ef61efe..81f01f9c 100644 --- "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\222\320\276\320\273\320\275\321\213.frag" +++ "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\222\320\276\320\273\320\275\321\213.frag" @@ -1,4 +1,4 @@ -#version 460 core +#version 460 core noperspective in vec2 logic_pos; diff --git "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\227\320\260\320\272\321\200\320\260\321\201\320\272\320\260 \320\277\320\276 \321\204\321\203\320\275\320\272\321\206\320\270\320\270.frag" "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\227\320\260\320\272\321\200\320\260\321\201\320\272\320\260 \320\277\320\276 \321\204\321\203\320\275\320\272\321\206\320\270\320\270.frag" index 7c786fb9..8aa06dff 100644 --- "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\227\320\260\320\272\321\200\320\260\321\201\320\272\320\260 \320\277\320\276 \321\204\321\203\320\275\320\272\321\206\320\270\320\270.frag" +++ "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\227\320\260\320\272\321\200\320\260\321\201\320\272\320\260 \320\277\320\276 \321\204\321\203\320\275\320\272\321\206\320\270\320\270.frag" @@ -1,4 +1,4 @@ -#version 460 core +#version 460 core noperspective in vec2 logic_pos; diff --git "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\234\320\270\320\275\320\270\320\274\321\203\320\274 \321\200\320\260\321\201\321\201\321\202\320\276\321\217\320\275\320\270\320\271.frag" "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\234\320\270\320\275\320\270\320\274\321\203\320\274 \321\200\320\260\321\201\321\201\321\202\320\276\321\217\320\275\320\270\320\271.frag" index bd77f26d..34c946c1 100644 --- "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\234\320\270\320\275\320\270\320\274\321\203\320\274 \321\200\320\260\321\201\321\201\321\202\320\276\321\217\320\275\320\270\320\271.frag" +++ "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\234\320\270\320\275\320\270\320\274\321\203\320\274 \321\200\320\260\321\201\321\201\321\202\320\276\321\217\320\275\320\270\320\271.frag" @@ -1,4 +1,4 @@ -#version 460 core +#version 460 core noperspective in vec2 logic_pos; diff --git "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\241\320\277\320\270\321\200\320\260\320\273\320\270.frag" "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\241\320\277\320\270\321\200\320\260\320\273\320\270.frag" index bc625521..954a52a9 100644 --- "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\241\320\277\320\270\321\200\320\260\320\273\320\270.frag" +++ "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\241\320\277\320\270\321\200\320\260\320\273\320\270.frag" @@ -1,4 +1,4 @@ -#version 460 core +#version 460 core noperspective in vec2 logic_pos; diff --git "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\241\321\203\320\274\320\274\320\260 \321\200\320\260\321\201\321\201\321\202\320\276\321\217\320\275\320\270\320\271.frag" "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\241\321\203\320\274\320\274\320\260 \321\200\320\260\321\201\321\201\321\202\320\276\321\217\320\275\320\270\320\271.frag" index dcefb36e..a61d7430 100644 --- "a/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\241\321\203\320\274\320\274\320\260 \321\200\320\260\321\201\321\201\321\202\320\276\321\217\320\275\320\270\320\271.frag" +++ "b/Samples/OpenGLABC/\320\242\320\276\321\207\320\272\320\270 \320\275\320\260 \320\277\320\276\320\273\320\265/\320\241\321\203\320\274\320\274\320\260 \321\200\320\260\321\201\321\201\321\202\320\276\321\217\320\275\320\270\320\271.frag" @@ -1,4 +1,4 @@ -#version 460 core +#version 460 core noperspective in vec2 logic_pos; diff --git a/Tests/.gitignore b/Tests/.gitignore index 8cf89ce8..aef8f0cc 100644 --- a/Tests/.gitignore +++ b/Tests/.gitignore @@ -1 +1 @@ -/DebugPCU +/DebugPCU diff --git a/Tests/DeleteAllTD.bat b/Tests/DeleteAllTD.bat index 48db95ec..f1e9ef76 100644 --- a/Tests/DeleteAllTD.bat +++ b/Tests/DeleteAllTD.bat @@ -1,4 +1,4 @@ - + del /S *.td diff --git "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/01#Const/1.pas" "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/01#Const/1.pas" index 630586ae..1b46baeb 100644 --- "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/01#Const/1.pas" +++ "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/01#Const/1.pas" @@ -1,4 +1,4 @@ -## uses OpenCLABC; +## uses OpenCLABC; var C := CQ(5); diff --git "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/02#Parameter/1.pas" "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/02#Parameter/1.pas" index 845baffb..436e8d1a 100644 --- "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/02#Parameter/1.pas" +++ "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/02#Parameter/1.pas" @@ -1,4 +1,4 @@ -## uses OpenCLABC; +## uses OpenCLABC; var P := new ParameterQueue('P'); diff --git "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/02#Parameter/realistic use.pas" "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/02#Parameter/realistic use.pas" index 748779f5..b5d58944 100644 --- "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/02#Parameter/realistic use.pas" +++ "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/02#Parameter/realistic use.pas" @@ -1,4 +1,4 @@ -uses OpenCLABC; +uses OpenCLABC; type MyQueueContainer = sealed class diff --git "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/05#Multiusable/~07#HostExec/Quick+MU.pas" "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/05#Multiusable/~07#HostExec/Quick+MU.pas" index f9298ea9..79023400 100644 --- "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/05#Multiusable/~07#HostExec/Quick+MU.pas" +++ "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/05#Multiusable/~07#HostExec/Quick+MU.pas" @@ -1,4 +1,4 @@ -## uses OpenCLABC; +## uses OpenCLABC; var Q := HFQ(()->(1).Println+1, false).Multiusable; CLContext.Default.SyncInvoke(CombineConvSyncQueue(a->a, |Q,Q|, false,true).Println).Println; \ No newline at end of file diff --git "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/OldClone.Add.pas" "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/OldClone.Add.pas" index 7b365f36..60441a14 100644 --- "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/OldClone.Add.pas" +++ "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/OldClone.Add.pas" @@ -1,4 +1,4 @@ -## uses OpenCLABC; +## uses OpenCLABC; var q: CLMemoryCCQ := CLMemory.Create(1).MakeCCQ.ThenProc(mem->Println(1), false); diff --git "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/ThenQueue(self).pas" "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/ThenQueue(self).pas" index 4503a47c..91ebad3b 100644 --- "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/ThenQueue(self).pas" +++ "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/ThenQueue(self).pas" @@ -1,4 +1,4 @@ -## uses OpenCLABC; +## uses OpenCLABC; var q := CLMemory.Create(1).MakeCCQ .ThenProc(mem->Println(1), false) diff --git "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/~00#Err/LazyQuickErr.pas" "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/~00#Err/LazyQuickErr.pas" index 35e7e330..a7c17a8f 100644 --- "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/~00#Err/LazyQuickErr.pas" +++ "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/~00#Err/LazyQuickErr.pas" @@ -1,4 +1,4 @@ -## uses OpenCLABC; +## uses OpenCLABC; CLContext.Default.SyncInvoke( CLMemoryCCQ.Create(HFQ(()->new CLMemory(1))).ThenWriteArray1(HFQ(()-> diff --git "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/~00#Err/QuickErr.pas" "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/~00#Err/QuickErr.pas" index 06c28c9f..bc570710 100644 --- "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/~00#Err/QuickErr.pas" +++ "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/07#GPUCommandContainer/~00#Err/QuickErr.pas" @@ -1,4 +1,4 @@ -## uses OpenCLABC; +## uses OpenCLABC; CLContext.Default.SyncInvoke( CLMemory.Create(1).MakeCCQ.ThenWriteArray1(HFQ(()-> diff --git "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/11#Finally+Handle/~00#Err/handle only branch.pas" "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/11#Finally+Handle/~00#Err/handle only branch.pas" index d470c37c..b34983d8 100644 --- "a/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/11#Finally+Handle/~00#Err/handle only branch.pas" +++ "b/Tests/Exec/CLABC/02#\320\222\321\213\320\277\320\276\320\273\320\275\320\265\320\275\320\270\320\265 \320\276\321\207\320\265\321\200\320\265\320\264\320\265\320\271/11#Finally+Handle/~00#Err/handle only branch.pas" @@ -1,4 +1,4 @@ -## uses OpenCLABC; +## uses OpenCLABC; var A := HPQ(()->raise new Exception('TestOK')); var B := HPQ(()->begin end); diff --git a/Tests/Exec/CLABC/03#ToString/02#Parameter/1.pas b/Tests/Exec/CLABC/03#ToString/02#Parameter/1.pas index 326a2796..2c33d0fc 100644 --- a/Tests/Exec/CLABC/03#ToString/02#Parameter/1.pas +++ b/Tests/Exec/CLABC/03#ToString/02#Parameter/1.pas @@ -1,4 +1,4 @@ -## uses OpenCLABC; +## uses OpenCLABC; Write(new ParameterQueue('P1', 1)); Write(new ParameterQueue('P2', 2)); \ No newline at end of file diff --git a/Tests/Exec/CLABC/03#ToString/03#Cast/typed nil.pas b/Tests/Exec/CLABC/03#ToString/03#Cast/typed nil.pas index bb4eeb42..e053e9ec 100644 --- a/Tests/Exec/CLABC/03#ToString/03#Cast/typed nil.pas +++ b/Tests/Exec/CLABC/03#ToString/03#Cast/typed nil.pas @@ -1,3 +1,3 @@ -## uses OpenCLABC; +## uses OpenCLABC; HPQ(()->begin end).Cast&.Print; \ No newline at end of file diff --git a/Tests/Exec/CLABC/03#ToString/11#Finally+Handle/1.pas b/Tests/Exec/CLABC/03#ToString/11#Finally+Handle/1.pas index 3da73c76..e9363f76 100644 --- a/Tests/Exec/CLABC/03#ToString/11#Finally+Handle/1.pas +++ b/Tests/Exec/CLABC/03#ToString/11#Finally+Handle/1.pas @@ -1,4 +1,4 @@ -## uses OpenCLABC; +## uses OpenCLABC; var Q := HFQ(()->1); diff --git "a/Tests/Exec/CLABC/04#Samples/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214.cl" "b/Tests/Exec/CLABC/04#Samples/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214.cl" index c1000222..fb93da11 100644 --- "a/Tests/Exec/CLABC/04#Samples/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214.cl" +++ "b/Tests/Exec/CLABC/04#Samples/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214/\320\230\320\263\321\200\320\260 \320\266\320\270\320\267\320\275\321\214.cl" @@ -1,4 +1,4 @@ - + #define ValAt(B,X,Y) (B)[((X)+W)%W + ((Y)+W)%W * W] diff --git a/Tests/Exec/CLABC/main testables.txt b/Tests/Exec/CLABC/main testables.txt index 3fa2f073..890e73d2 100644 --- a/Tests/Exec/CLABC/main testables.txt +++ b/Tests/Exec/CLABC/main testables.txt @@ -1,4 +1,4 @@ - + - 01#Wrap diff --git a/Utils/!bat/0-cd-git-root.bat b/Utils/!bat/0-cd-git-root.bat index ebcad5af..ce402dde 100644 --- a/Utils/!bat/0-cd-git-root.bat +++ b/Utils/!bat/0-cd-git-root.bat @@ -1,4 +1,4 @@ -FOR /F "tokens=* USEBACKQ" %%F IN (`git rev-parse --show-toplevel`) DO ( +FOR /F "tokens=* USEBACKQ" %%F IN (`git rev-parse --show-toplevel`) DO ( SET git_root=%%F ) cd %git_root% \ No newline at end of file diff --git a/Utils/!bat/1-reset.bat b/Utils/!bat/1-reset.bat index 8826079f..872713e2 100644 --- a/Utils/!bat/1-reset.bat +++ b/Utils/!bat/1-reset.bat @@ -1,3 +1,3 @@ -call 0-cd-git-root.bat +call 0-cd-git-root.bat git reset --hard pause \ No newline at end of file diff --git a/Utils/!bat/init.bat b/Utils/!bat/init.bat index 16c900db..680c0ade 100644 --- a/Utils/!bat/init.bat +++ b/Utils/!bat/init.bat @@ -1,4 +1,4 @@ -call 0-cd-git-root.bat +call 0-cd-git-root.bat git remote add -f Utils git@github.com:SunSerega/SunUtils.git git subtree add --prefix="Utils" Utils SunUtils-main pause \ No newline at end of file diff --git a/Utils/!bat/pull.bat b/Utils/!bat/pull.bat index 4b166a8a..55e0af73 100644 --- a/Utils/!bat/pull.bat +++ b/Utils/!bat/pull.bat @@ -1,4 +1,4 @@ -call 0-cd-git-root.bat +call 0-cd-git-root.bat git subtree pull --prefix="Utils" Utils SunUtils-main git push git pull Utils SunUtils-main:SunUtils-main diff --git a/Utils/!bat/push.bat b/Utils/!bat/push.bat index bc2e35e4..e6e8a5fc 100644 --- a/Utils/!bat/push.bat +++ b/Utils/!bat/push.bat @@ -1,4 +1,4 @@ -call 0-cd-git-root.bat +call 0-cd-git-root.bat git subtree push --prefix="Utils" --rejoin Utils SunUtils-main git push git pull Utils SunUtils-main:SunUtils-main diff --git a/Utils/.gitignore b/Utils/.gitignore index a68b829e..47f2ab7c 100644 --- a/Utils/.gitignore +++ b/Utils/.gitignore @@ -1,4 +1,4 @@ -*.pcu +*.pcu *.pdb *.exe *.compile_lock diff --git a/Utils/LICENSE b/Utils/LICENSE index fdddb29a..3e845e76 100644 --- a/Utils/LICENSE +++ b/Utils/LICENSE @@ -1,4 +1,4 @@ -This is free and unencumbered software released into the public domain. +This is free and unencumbered software released into the public domain. Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled