OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // This file is auto-generated from | 5 // This file is auto-generated from |
6 // gpu/command_buffer/build_gles2_cmd_buffer.py | 6 // gpu/command_buffer/build_gles2_cmd_buffer.py |
7 // It's formatted by clang-format using chromium coding style: | 7 // It's formatted by clang-format using chromium coding style: |
8 // clang-format -i -style=chromium filename | 8 // clang-format -i -style=chromium filename |
9 // DO NOT EDIT! | 9 // DO NOT EDIT! |
10 | 10 |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
439 helper_->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, | 439 helper_->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, |
440 width, height); | 440 width, height); |
441 CheckGLError(); | 441 CheckGLError(); |
442 } | 442 } |
443 | 443 |
444 GLuint GLES2Implementation::CreateProgram() { | 444 GLuint GLES2Implementation::CreateProgram() { |
445 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 445 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
446 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCreateProgram(" | 446 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCreateProgram(" |
447 << ")"); | 447 << ")"); |
448 GLuint client_id; | 448 GLuint client_id; |
449 GetIdHandler(id_namespaces::kProgramsAndShaders) | 449 GetIdHandler(SharedIdNamespaces::kProgramsAndShaders) |
450 ->MakeIds(this, 0, 1, &client_id); | 450 ->MakeIds(this, 0, 1, &client_id); |
451 helper_->CreateProgram(client_id); | 451 helper_->CreateProgram(client_id); |
452 GPU_CLIENT_LOG("returned " << client_id); | 452 GPU_CLIENT_LOG("returned " << client_id); |
453 CheckGLError(); | 453 CheckGLError(); |
454 return client_id; | 454 return client_id; |
455 } | 455 } |
456 | 456 |
457 GLuint GLES2Implementation::CreateShader(GLenum type) { | 457 GLuint GLES2Implementation::CreateShader(GLenum type) { |
458 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 458 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
459 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCreateShader(" | 459 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCreateShader(" |
460 << GLES2Util::GetStringShaderType(type) << ")"); | 460 << GLES2Util::GetStringShaderType(type) << ")"); |
461 GLuint client_id; | 461 GLuint client_id; |
462 GetIdHandler(id_namespaces::kProgramsAndShaders) | 462 GetIdHandler(SharedIdNamespaces::kProgramsAndShaders) |
463 ->MakeIds(this, 0, 1, &client_id); | 463 ->MakeIds(this, 0, 1, &client_id); |
464 helper_->CreateShader(type, client_id); | 464 helper_->CreateShader(type, client_id); |
465 GPU_CLIENT_LOG("returned " << client_id); | 465 GPU_CLIENT_LOG("returned " << client_id); |
466 CheckGLError(); | 466 CheckGLError(); |
467 return client_id; | 467 return client_id; |
468 } | 468 } |
469 | 469 |
470 void GLES2Implementation::CullFace(GLenum mode) { | 470 void GLES2Implementation::CullFace(GLenum mode) { |
471 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 471 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
472 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCullFace(" | 472 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCullFace(" |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
674 << flags << ")"); | 674 << flags << ")"); |
675 if (condition != GL_SYNC_GPU_COMMANDS_COMPLETE) { | 675 if (condition != GL_SYNC_GPU_COMMANDS_COMPLETE) { |
676 SetGLError(GL_INVALID_ENUM, "glFenceSync", "condition GL_INVALID_ENUM"); | 676 SetGLError(GL_INVALID_ENUM, "glFenceSync", "condition GL_INVALID_ENUM"); |
677 return 0; | 677 return 0; |
678 } | 678 } |
679 if (flags != 0) { | 679 if (flags != 0) { |
680 SetGLError(GL_INVALID_VALUE, "glFenceSync", "flags GL_INVALID_VALUE"); | 680 SetGLError(GL_INVALID_VALUE, "glFenceSync", "flags GL_INVALID_VALUE"); |
681 return 0; | 681 return 0; |
682 } | 682 } |
683 GLuint client_id; | 683 GLuint client_id; |
684 GetIdHandler(id_namespaces::kSyncs)->MakeIds(this, 0, 1, &client_id); | 684 GetIdHandler(SharedIdNamespaces::kSyncs)->MakeIds(this, 0, 1, &client_id); |
685 helper_->FenceSync(client_id); | 685 helper_->FenceSync(client_id); |
686 GPU_CLIENT_LOG("returned " << client_id); | 686 GPU_CLIENT_LOG("returned " << client_id); |
687 CheckGLError(); | 687 CheckGLError(); |
688 return reinterpret_cast<GLsync>(client_id); | 688 return reinterpret_cast<GLsync>(client_id); |
689 } | 689 } |
690 | 690 |
691 void GLES2Implementation::FramebufferRenderbuffer(GLenum target, | 691 void GLES2Implementation::FramebufferRenderbuffer(GLenum target, |
692 GLenum attachment, | 692 GLenum attachment, |
693 GLenum renderbuffertarget, | 693 GLenum renderbuffertarget, |
694 GLuint renderbuffer) { | 694 GLuint renderbuffer) { |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
742 } | 742 } |
743 | 743 |
744 void GLES2Implementation::GenBuffers(GLsizei n, GLuint* buffers) { | 744 void GLES2Implementation::GenBuffers(GLsizei n, GLuint* buffers) { |
745 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenBuffers(" << n << ", " | 745 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenBuffers(" << n << ", " |
746 << static_cast<const void*>(buffers) << ")"); | 746 << static_cast<const void*>(buffers) << ")"); |
747 if (n < 0) { | 747 if (n < 0) { |
748 SetGLError(GL_INVALID_VALUE, "glGenBuffers", "n < 0"); | 748 SetGLError(GL_INVALID_VALUE, "glGenBuffers", "n < 0"); |
749 return; | 749 return; |
750 } | 750 } |
751 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 751 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
752 GetIdHandler(id_namespaces::kBuffers)->MakeIds(this, 0, n, buffers); | 752 GetIdHandler(SharedIdNamespaces::kBuffers)->MakeIds(this, 0, n, buffers); |
753 GenBuffersHelper(n, buffers); | 753 GenBuffersHelper(n, buffers); |
754 helper_->GenBuffersImmediate(n, buffers); | 754 helper_->GenBuffersImmediate(n, buffers); |
755 if (share_group_->bind_generates_resource()) | 755 if (share_group_->bind_generates_resource()) |
756 helper_->CommandBufferHelper::Flush(); | 756 helper_->CommandBufferHelper::Flush(); |
757 GPU_CLIENT_LOG_CODE_BLOCK({ | 757 GPU_CLIENT_LOG_CODE_BLOCK({ |
758 for (GLsizei i = 0; i < n; ++i) { | 758 for (GLsizei i = 0; i < n; ++i) { |
759 GPU_CLIENT_LOG(" " << i << ": " << buffers[i]); | 759 GPU_CLIENT_LOG(" " << i << ": " << buffers[i]); |
760 } | 760 } |
761 }); | 761 }); |
762 CheckGLError(); | 762 CheckGLError(); |
763 } | 763 } |
764 | 764 |
765 void GLES2Implementation::GenerateMipmap(GLenum target) { | 765 void GLES2Implementation::GenerateMipmap(GLenum target) { |
766 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 766 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
767 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenerateMipmap(" | 767 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenerateMipmap(" |
768 << GLES2Util::GetStringTextureBindTarget(target) << ")"); | 768 << GLES2Util::GetStringTextureBindTarget(target) << ")"); |
769 helper_->GenerateMipmap(target); | 769 helper_->GenerateMipmap(target); |
770 CheckGLError(); | 770 CheckGLError(); |
771 } | 771 } |
772 | 772 |
773 void GLES2Implementation::GenFramebuffers(GLsizei n, GLuint* framebuffers) { | 773 void GLES2Implementation::GenFramebuffers(GLsizei n, GLuint* framebuffers) { |
774 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenFramebuffers(" << n << ", " | 774 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenFramebuffers(" << n << ", " |
775 << static_cast<const void*>(framebuffers) << ")"); | 775 << static_cast<const void*>(framebuffers) << ")"); |
776 if (n < 0) { | 776 if (n < 0) { |
777 SetGLError(GL_INVALID_VALUE, "glGenFramebuffers", "n < 0"); | 777 SetGLError(GL_INVALID_VALUE, "glGenFramebuffers", "n < 0"); |
778 return; | 778 return; |
779 } | 779 } |
780 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 780 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
781 GetIdHandler(id_namespaces::kFramebuffers)->MakeIds(this, 0, n, framebuffers); | 781 IdAllocator* id_allocator = GetIdAllocator(IdNamespaces::kFramebuffers); |
| 782 for (GLsizei ii = 0; ii < n; ++ii) |
| 783 framebuffers[ii] = id_allocator->AllocateID(); |
782 GenFramebuffersHelper(n, framebuffers); | 784 GenFramebuffersHelper(n, framebuffers); |
783 helper_->GenFramebuffersImmediate(n, framebuffers); | 785 helper_->GenFramebuffersImmediate(n, framebuffers); |
784 if (share_group_->bind_generates_resource()) | |
785 helper_->CommandBufferHelper::Flush(); | |
786 GPU_CLIENT_LOG_CODE_BLOCK({ | 786 GPU_CLIENT_LOG_CODE_BLOCK({ |
787 for (GLsizei i = 0; i < n; ++i) { | 787 for (GLsizei i = 0; i < n; ++i) { |
788 GPU_CLIENT_LOG(" " << i << ": " << framebuffers[i]); | 788 GPU_CLIENT_LOG(" " << i << ": " << framebuffers[i]); |
789 } | 789 } |
790 }); | 790 }); |
791 CheckGLError(); | 791 CheckGLError(); |
792 } | 792 } |
793 | 793 |
794 void GLES2Implementation::GenRenderbuffers(GLsizei n, GLuint* renderbuffers) { | 794 void GLES2Implementation::GenRenderbuffers(GLsizei n, GLuint* renderbuffers) { |
795 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenRenderbuffers(" << n << ", " | 795 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenRenderbuffers(" << n << ", " |
796 << static_cast<const void*>(renderbuffers) << ")"); | 796 << static_cast<const void*>(renderbuffers) << ")"); |
797 if (n < 0) { | 797 if (n < 0) { |
798 SetGLError(GL_INVALID_VALUE, "glGenRenderbuffers", "n < 0"); | 798 SetGLError(GL_INVALID_VALUE, "glGenRenderbuffers", "n < 0"); |
799 return; | 799 return; |
800 } | 800 } |
801 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 801 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
802 GetIdHandler(id_namespaces::kRenderbuffers) | 802 GetIdHandler(SharedIdNamespaces::kRenderbuffers) |
803 ->MakeIds(this, 0, n, renderbuffers); | 803 ->MakeIds(this, 0, n, renderbuffers); |
804 GenRenderbuffersHelper(n, renderbuffers); | 804 GenRenderbuffersHelper(n, renderbuffers); |
805 helper_->GenRenderbuffersImmediate(n, renderbuffers); | 805 helper_->GenRenderbuffersImmediate(n, renderbuffers); |
806 if (share_group_->bind_generates_resource()) | 806 if (share_group_->bind_generates_resource()) |
807 helper_->CommandBufferHelper::Flush(); | 807 helper_->CommandBufferHelper::Flush(); |
808 GPU_CLIENT_LOG_CODE_BLOCK({ | 808 GPU_CLIENT_LOG_CODE_BLOCK({ |
809 for (GLsizei i = 0; i < n; ++i) { | 809 for (GLsizei i = 0; i < n; ++i) { |
810 GPU_CLIENT_LOG(" " << i << ": " << renderbuffers[i]); | 810 GPU_CLIENT_LOG(" " << i << ": " << renderbuffers[i]); |
811 } | 811 } |
812 }); | 812 }); |
813 CheckGLError(); | 813 CheckGLError(); |
814 } | 814 } |
815 | 815 |
816 void GLES2Implementation::GenSamplers(GLsizei n, GLuint* samplers) { | 816 void GLES2Implementation::GenSamplers(GLsizei n, GLuint* samplers) { |
817 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenSamplers(" << n << ", " | 817 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenSamplers(" << n << ", " |
818 << static_cast<const void*>(samplers) << ")"); | 818 << static_cast<const void*>(samplers) << ")"); |
819 if (n < 0) { | 819 if (n < 0) { |
820 SetGLError(GL_INVALID_VALUE, "glGenSamplers", "n < 0"); | 820 SetGLError(GL_INVALID_VALUE, "glGenSamplers", "n < 0"); |
821 return; | 821 return; |
822 } | 822 } |
823 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 823 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
824 GetIdHandler(id_namespaces::kSamplers)->MakeIds(this, 0, n, samplers); | 824 GetIdHandler(SharedIdNamespaces::kSamplers)->MakeIds(this, 0, n, samplers); |
825 GenSamplersHelper(n, samplers); | 825 GenSamplersHelper(n, samplers); |
826 helper_->GenSamplersImmediate(n, samplers); | 826 helper_->GenSamplersImmediate(n, samplers); |
827 if (share_group_->bind_generates_resource()) | 827 if (share_group_->bind_generates_resource()) |
828 helper_->CommandBufferHelper::Flush(); | 828 helper_->CommandBufferHelper::Flush(); |
829 GPU_CLIENT_LOG_CODE_BLOCK({ | 829 GPU_CLIENT_LOG_CODE_BLOCK({ |
830 for (GLsizei i = 0; i < n; ++i) { | 830 for (GLsizei i = 0; i < n; ++i) { |
831 GPU_CLIENT_LOG(" " << i << ": " << samplers[i]); | 831 GPU_CLIENT_LOG(" " << i << ": " << samplers[i]); |
832 } | 832 } |
833 }); | 833 }); |
834 CheckGLError(); | 834 CheckGLError(); |
835 } | 835 } |
836 | 836 |
837 void GLES2Implementation::GenTextures(GLsizei n, GLuint* textures) { | 837 void GLES2Implementation::GenTextures(GLsizei n, GLuint* textures) { |
838 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenTextures(" << n << ", " | 838 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenTextures(" << n << ", " |
839 << static_cast<const void*>(textures) << ")"); | 839 << static_cast<const void*>(textures) << ")"); |
840 if (n < 0) { | 840 if (n < 0) { |
841 SetGLError(GL_INVALID_VALUE, "glGenTextures", "n < 0"); | 841 SetGLError(GL_INVALID_VALUE, "glGenTextures", "n < 0"); |
842 return; | 842 return; |
843 } | 843 } |
844 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 844 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
845 GetIdHandler(id_namespaces::kTextures)->MakeIds(this, 0, n, textures); | 845 GetIdHandler(SharedIdNamespaces::kTextures)->MakeIds(this, 0, n, textures); |
846 GenTexturesHelper(n, textures); | 846 GenTexturesHelper(n, textures); |
847 helper_->GenTexturesImmediate(n, textures); | 847 helper_->GenTexturesImmediate(n, textures); |
848 if (share_group_->bind_generates_resource()) | 848 if (share_group_->bind_generates_resource()) |
849 helper_->CommandBufferHelper::Flush(); | 849 helper_->CommandBufferHelper::Flush(); |
850 GPU_CLIENT_LOG_CODE_BLOCK({ | 850 GPU_CLIENT_LOG_CODE_BLOCK({ |
851 for (GLsizei i = 0; i < n; ++i) { | 851 for (GLsizei i = 0; i < n; ++i) { |
852 GPU_CLIENT_LOG(" " << i << ": " << textures[i]); | 852 GPU_CLIENT_LOG(" " << i << ": " << textures[i]); |
853 } | 853 } |
854 }); | 854 }); |
855 CheckGLError(); | 855 CheckGLError(); |
856 } | 856 } |
857 | 857 |
858 void GLES2Implementation::GenTransformFeedbacks(GLsizei n, GLuint* ids) { | 858 void GLES2Implementation::GenTransformFeedbacks(GLsizei n, GLuint* ids) { |
859 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenTransformFeedbacks(" << n | 859 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenTransformFeedbacks(" << n |
860 << ", " << static_cast<const void*>(ids) << ")"); | 860 << ", " << static_cast<const void*>(ids) << ")"); |
861 if (n < 0) { | 861 if (n < 0) { |
862 SetGLError(GL_INVALID_VALUE, "glGenTransformFeedbacks", "n < 0"); | 862 SetGLError(GL_INVALID_VALUE, "glGenTransformFeedbacks", "n < 0"); |
863 return; | 863 return; |
864 } | 864 } |
865 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 865 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
866 GetIdHandler(id_namespaces::kTransformFeedbacks)->MakeIds(this, 0, n, ids); | 866 IdAllocator* id_allocator = GetIdAllocator(IdNamespaces::kTransformFeedbacks); |
| 867 for (GLsizei ii = 0; ii < n; ++ii) |
| 868 ids[ii] = id_allocator->AllocateID(); |
867 GenTransformFeedbacksHelper(n, ids); | 869 GenTransformFeedbacksHelper(n, ids); |
868 helper_->GenTransformFeedbacksImmediate(n, ids); | 870 helper_->GenTransformFeedbacksImmediate(n, ids); |
869 if (share_group_->bind_generates_resource()) | |
870 helper_->CommandBufferHelper::Flush(); | |
871 GPU_CLIENT_LOG_CODE_BLOCK({ | 871 GPU_CLIENT_LOG_CODE_BLOCK({ |
872 for (GLsizei i = 0; i < n; ++i) { | 872 for (GLsizei i = 0; i < n; ++i) { |
873 GPU_CLIENT_LOG(" " << i << ": " << ids[i]); | 873 GPU_CLIENT_LOG(" " << i << ": " << ids[i]); |
874 } | 874 } |
875 }); | 875 }); |
876 CheckGLError(); | 876 CheckGLError(); |
877 } | 877 } |
878 | 878 |
879 void GLES2Implementation::GetBooleanv(GLenum pname, GLboolean* params) { | 879 void GLES2Implementation::GetBooleanv(GLenum pname, GLboolean* params) { |
880 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 880 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
(...skipping 2038 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2919 } | 2919 } |
2920 | 2920 |
2921 void GLES2Implementation::GenQueriesEXT(GLsizei n, GLuint* queries) { | 2921 void GLES2Implementation::GenQueriesEXT(GLsizei n, GLuint* queries) { |
2922 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenQueriesEXT(" << n << ", " | 2922 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenQueriesEXT(" << n << ", " |
2923 << static_cast<const void*>(queries) << ")"); | 2923 << static_cast<const void*>(queries) << ")"); |
2924 if (n < 0) { | 2924 if (n < 0) { |
2925 SetGLError(GL_INVALID_VALUE, "glGenQueriesEXT", "n < 0"); | 2925 SetGLError(GL_INVALID_VALUE, "glGenQueriesEXT", "n < 0"); |
2926 return; | 2926 return; |
2927 } | 2927 } |
2928 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 2928 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
2929 IdAllocator* id_allocator = GetIdAllocator(id_namespaces::kQueries); | 2929 IdAllocator* id_allocator = GetIdAllocator(IdNamespaces::kQueries); |
2930 for (GLsizei ii = 0; ii < n; ++ii) | 2930 for (GLsizei ii = 0; ii < n; ++ii) |
2931 queries[ii] = id_allocator->AllocateID(); | 2931 queries[ii] = id_allocator->AllocateID(); |
2932 GenQueriesEXTHelper(n, queries); | 2932 GenQueriesEXTHelper(n, queries); |
2933 helper_->GenQueriesEXTImmediate(n, queries); | 2933 helper_->GenQueriesEXTImmediate(n, queries); |
2934 if (share_group_->bind_generates_resource()) | |
2935 helper_->CommandBufferHelper::Flush(); | |
2936 GPU_CLIENT_LOG_CODE_BLOCK({ | 2934 GPU_CLIENT_LOG_CODE_BLOCK({ |
2937 for (GLsizei i = 0; i < n; ++i) { | 2935 for (GLsizei i = 0; i < n; ++i) { |
2938 GPU_CLIENT_LOG(" " << i << ": " << queries[i]); | 2936 GPU_CLIENT_LOG(" " << i << ": " << queries[i]); |
2939 } | 2937 } |
2940 }); | 2938 }); |
2941 CheckGLError(); | 2939 CheckGLError(); |
2942 } | 2940 } |
2943 | 2941 |
2944 void GLES2Implementation::DeleteQueriesEXT(GLsizei n, const GLuint* queries) { | 2942 void GLES2Implementation::DeleteQueriesEXT(GLsizei n, const GLuint* queries) { |
2945 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 2943 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2982 } | 2980 } |
2983 | 2981 |
2984 void GLES2Implementation::GenVertexArraysOES(GLsizei n, GLuint* arrays) { | 2982 void GLES2Implementation::GenVertexArraysOES(GLsizei n, GLuint* arrays) { |
2985 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenVertexArraysOES(" << n << ", " | 2983 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glGenVertexArraysOES(" << n << ", " |
2986 << static_cast<const void*>(arrays) << ")"); | 2984 << static_cast<const void*>(arrays) << ")"); |
2987 if (n < 0) { | 2985 if (n < 0) { |
2988 SetGLError(GL_INVALID_VALUE, "glGenVertexArraysOES", "n < 0"); | 2986 SetGLError(GL_INVALID_VALUE, "glGenVertexArraysOES", "n < 0"); |
2989 return; | 2987 return; |
2990 } | 2988 } |
2991 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 2989 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
2992 GetIdHandler(id_namespaces::kVertexArrays)->MakeIds(this, 0, n, arrays); | 2990 IdAllocator* id_allocator = GetIdAllocator(IdNamespaces::kVertexArrays); |
| 2991 for (GLsizei ii = 0; ii < n; ++ii) |
| 2992 arrays[ii] = id_allocator->AllocateID(); |
2993 GenVertexArraysOESHelper(n, arrays); | 2993 GenVertexArraysOESHelper(n, arrays); |
2994 helper_->GenVertexArraysOESImmediate(n, arrays); | 2994 helper_->GenVertexArraysOESImmediate(n, arrays); |
2995 if (share_group_->bind_generates_resource()) | |
2996 helper_->CommandBufferHelper::Flush(); | |
2997 GPU_CLIENT_LOG_CODE_BLOCK({ | 2995 GPU_CLIENT_LOG_CODE_BLOCK({ |
2998 for (GLsizei i = 0; i < n; ++i) { | 2996 for (GLsizei i = 0; i < n; ++i) { |
2999 GPU_CLIENT_LOG(" " << i << ": " << arrays[i]); | 2997 GPU_CLIENT_LOG(" " << i << ": " << arrays[i]); |
3000 } | 2998 } |
3001 }); | 2999 }); |
3002 CheckGLError(); | 3000 CheckGLError(); |
3003 } | 3001 } |
3004 | 3002 |
3005 void GLES2Implementation::DeleteVertexArraysOES(GLsizei n, | 3003 void GLES2Implementation::DeleteVertexArraysOES(GLsizei n, |
3006 const GLuint* arrays) { | 3004 const GLuint* arrays) { |
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3538 | 3536 |
3539 void GLES2Implementation::SetEnableDCLayersCHROMIUM(GLboolean enabled) { | 3537 void GLES2Implementation::SetEnableDCLayersCHROMIUM(GLboolean enabled) { |
3540 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 3538 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
3541 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSetEnableDCLayersCHROMIUM(" | 3539 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSetEnableDCLayersCHROMIUM(" |
3542 << GLES2Util::GetStringBool(enabled) << ")"); | 3540 << GLES2Util::GetStringBool(enabled) << ")"); |
3543 helper_->SetEnableDCLayersCHROMIUM(enabled); | 3541 helper_->SetEnableDCLayersCHROMIUM(enabled); |
3544 CheckGLError(); | 3542 CheckGLError(); |
3545 } | 3543 } |
3546 | 3544 |
3547 #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_IMPL_AUTOGEN_H_ | 3545 #endif // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_IMPL_AUTOGEN_H_ |
OLD | NEW |