Skip to content

Commit

Permalink
Merge branch 'darby_main_original'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ggarra13
ggarra13 committed Jan 28, 2024
2 parents 1c9fc08 + cbb5898 commit 11ca1fa
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 56 deletions.
57 changes: 29 additions & 28 deletions lib/tlTimelineGL/RenderShaders_GLES_2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,34 +127,35 @@ namespace tl
{
const std::string pixelType =
"// enum tl::image::PixelType\n"
"const int PixelType_None = 0;\n"
"const int PixelType_L_U8 = 1;\n"
"const int PixelType_L_U16 = 2;\n"
"const int PixelType_L_U32 = 3;\n"
"const int PixelType_L_F16 = 4;\n"
"const int PixelType_L_F32 = 5;\n"
"const int PixelType_LA_U8 = 6;\n"
"const int PixelType_LA_U32 = 7;\n"
"const int PixelType_LA_U16 = 8;\n"
"const int PixelType_LA_F16 = 9;\n"
"const int PixelType_LA_F32 = 10;\n"
"const int PixelType_RGB_U8 = 11;\n"
"const int PixelType_RGB_U10 = 12;\n"
"const int PixelType_RGB_U16 = 13;\n"
"const int PixelType_RGB_U32 = 14;\n"
"const int PixelType_RGB_F16 = 15;\n"
"const int PixelType_RGB_F32 = 16;\n"
"const int PixelType_RGBA_U8 = 17;\n"
"const int PixelType_RGBA_U16 = 18;\n"
"const int PixelType_RGBA_U32 = 19;\n"
"const int PixelType_RGBA_F16 = 20;\n"
"const int PixelType_RGBA_F32 = 21;\n"
"const int PixelType_YUV_420P_U8 = 22;\n"
"const int PixelType_YUV_422P_U8 = 23;\n"
"const int PixelType_YUV_444P_U8 = 24;\n"
"const int PixelType_YUV_420P_U16 = 25;\n"
"const int PixelType_YUV_422P_U16 = 26;\n"
"const int PixelType_YUV_444P_U16 = 27;\n";
"const int PixelType_None = 0;\n"
"const int PixelType_L_U8 = 1;\n"
"const int PixelType_L_U16 = 2;\n"
"const int PixelType_L_U32 = 3;\n"
"const int PixelType_L_F16 = 4;\n"
"const int PixelType_L_F32 = 5;\n"
"const int PixelType_LA_U8 = 6;\n"
"const int PixelType_LA_U32 = 7;\n"
"const int PixelType_LA_U16 = 8;\n"
"const int PixelType_LA_F16 = 9;\n"
"const int PixelType_LA_F32 = 10;\n"
"const int PixelType_RGB_U8 = 11;\n"
"const int PixelType_RGB_U10 = 12;\n"
"const int PixelType_RGB_U16 = 13;\n"
"const int PixelType_RGB_U32 = 14;\n"
"const int PixelType_RGB_F16 = 15;\n"
"const int PixelType_RGB_F32 = 16;\n"
"const int PixelType_RGBA_U8 = 17;\n"
"const int PixelType_RGBA_U16 = 18;\n"
"const int PixelType_RGBA_U32 = 19;\n"
"const int PixelType_RGBA_F16 = 20;\n"
"const int PixelType_RGBA_F32 = 21;\n"
"const int PixelType_YUV_420P_U8 = 22;\n"
"const int PixelType_YUV_422P_U8 = 23;\n"
"const int PixelType_YUV_444P_U8 = 24;\n"
"const int PixelType_YUV_420P_U16 = 25;\n"
"const int PixelType_YUV_422P_U16 = 26;\n"
"const int PixelType_YUV_444P_U16 = 27;\n"
"const int PixelType_ARGB_4444_Premult = 28;\n";

const std::string videoLevels =
"// enum tl::image::VideoLevels\n"
Expand Down
57 changes: 29 additions & 28 deletions lib/tlTimelineGL/RenderShaders_GL_4_1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,34 +132,35 @@ namespace tl
{
const std::string pixelType =
"// enum tl::image::PixelType\n"
"const uint PixelType_None = 0;\n"
"const uint PixelType_L_U8 = 1;\n"
"const uint PixelType_L_U16 = 2;\n"
"const uint PixelType_L_U32 = 3;\n"
"const uint PixelType_L_F16 = 4;\n"
"const uint PixelType_L_F32 = 5;\n"
"const uint PixelType_LA_U8 = 6;\n"
"const uint PixelType_LA_U32 = 7;\n"
"const uint PixelType_LA_U16 = 8;\n"
"const uint PixelType_LA_F16 = 9;\n"
"const uint PixelType_LA_F32 = 10;\n"
"const uint PixelType_RGB_U8 = 11;\n"
"const uint PixelType_RGB_U10 = 12;\n"
"const uint PixelType_RGB_U16 = 13;\n"
"const uint PixelType_RGB_U32 = 14;\n"
"const uint PixelType_RGB_F16 = 15;\n"
"const uint PixelType_RGB_F32 = 16;\n"
"const uint PixelType_RGBA_U8 = 17;\n"
"const uint PixelType_RGBA_U16 = 18;\n"
"const uint PixelType_RGBA_U32 = 19;\n"
"const uint PixelType_RGBA_F16 = 20;\n"
"const uint PixelType_RGBA_F32 = 21;\n"
"const uint PixelType_YUV_420P_U8 = 22;\n"
"const uint PixelType_YUV_422P_U8 = 23;\n"
"const uint PixelType_YUV_444P_U8 = 24;\n"
"const uint PixelType_YUV_420P_U16 = 25;\n"
"const uint PixelType_YUV_422P_U16 = 26;\n"
"const uint PixelType_YUV_444P_U16 = 27;\n";
"const uint PixelType_None = 0;\n"
"const uint PixelType_L_U8 = 1;\n"
"const uint PixelType_L_U16 = 2;\n"
"const uint PixelType_L_U32 = 3;\n"
"const uint PixelType_L_F16 = 4;\n"
"const uint PixelType_L_F32 = 5;\n"
"const uint PixelType_LA_U8 = 6;\n"
"const uint PixelType_LA_U32 = 7;\n"
"const uint PixelType_LA_U16 = 8;\n"
"const uint PixelType_LA_F16 = 9;\n"
"const uint PixelType_LA_F32 = 10;\n"
"const uint PixelType_RGB_U8 = 11;\n"
"const uint PixelType_RGB_U10 = 12;\n"
"const uint PixelType_RGB_U16 = 13;\n"
"const uint PixelType_RGB_U32 = 14;\n"
"const uint PixelType_RGB_F16 = 15;\n"
"const uint PixelType_RGB_F32 = 16;\n"
"const uint PixelType_RGBA_U8 = 17;\n"
"const uint PixelType_RGBA_U16 = 18;\n"
"const uint PixelType_RGBA_U32 = 19;\n"
"const uint PixelType_RGBA_F16 = 20;\n"
"const uint PixelType_RGBA_F32 = 21;\n"
"const uint PixelType_YUV_420P_U8 = 22;\n"
"const uint PixelType_YUV_422P_U8 = 23;\n"
"const uint PixelType_YUV_444P_U8 = 24;\n"
"const uint PixelType_YUV_420P_U16 = 25;\n"
"const uint PixelType_YUV_422P_U16 = 26;\n"
"const uint PixelType_YUV_444P_U16 = 27;\n"
"const uint PixelType_ARGB_4444_Premult = 28;\n";

const std::string videoLevels =
"// enum tl::image::VideoLevels\n"
Expand Down

0 comments on commit 11ca1fa

Please sign in to comment.