Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(435)

Side by Side Diff: gpu/blink/webgraphicscontext3d_impl.cc

Issue 1025303006: Mapping all newly available ES3 entry points in webgraphicscontext3d_impl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gpu/blink/webgraphicscontext3d_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "gpu/blink/webgraphicscontext3d_impl.h" 5 #include "gpu/blink/webgraphicscontext3d_impl.h"
6 6
7 #include "base/atomicops.h" 7 #include "base/atomicops.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "gpu/GLES2/gl2extchromium.h" 10 #include "gpu/GLES2/gl2extchromium.h"
(...skipping 15 matching lines...) Expand all
26 using blink::WGC3Dclampf; 26 using blink::WGC3Dclampf;
27 using blink::WGC3Denum; 27 using blink::WGC3Denum;
28 using blink::WGC3Dfloat; 28 using blink::WGC3Dfloat;
29 using blink::WGC3Dint; 29 using blink::WGC3Dint;
30 using blink::WGC3Dintptr; 30 using blink::WGC3Dintptr;
31 using blink::WGC3Dsizei; 31 using blink::WGC3Dsizei;
32 using blink::WGC3Dsizeiptr; 32 using blink::WGC3Dsizeiptr;
33 using blink::WGC3Duint64; 33 using blink::WGC3Duint64;
34 using blink::WGC3Duint; 34 using blink::WGC3Duint;
35 using blink::WebGLId; 35 using blink::WebGLId;
36 using blink::WGC3Dsync;
36 37
37 namespace gpu_blink { 38 namespace gpu_blink {
38 39
39 namespace { 40 namespace {
40 41
41 uint32_t GenFlushID() { 42 uint32_t GenFlushID() {
42 static base::subtle::Atomic32 flush_id = 0; 43 static base::subtle::Atomic32 flush_id = 0;
43 44
44 base::subtle::Atomic32 my_id = base::subtle::Barrier_AtomicIncrement( 45 base::subtle::Atomic32 my_id = base::subtle::Barrier_AtomicIncrement(
45 &flush_id, 1); 46 &flush_id, 1);
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 DELEGATE_TO_GL_2(bindTransformFeedback, BindTransformFeedback, WGC3Denum, 1031 DELEGATE_TO_GL_2(bindTransformFeedback, BindTransformFeedback, WGC3Denum,
1031 WebGLId) 1032 WebGLId)
1032 DELEGATE_TO_GL_4(clearBufferfi, ClearBufferfi, WGC3Denum, WGC3Dint, WGC3Dfloat, 1033 DELEGATE_TO_GL_4(clearBufferfi, ClearBufferfi, WGC3Denum, WGC3Dint, WGC3Dfloat,
1033 WGC3Dint) 1034 WGC3Dint)
1034 DELEGATE_TO_GL_3(clearBufferfv, ClearBufferfv, WGC3Denum, WGC3Dint, 1035 DELEGATE_TO_GL_3(clearBufferfv, ClearBufferfv, WGC3Denum, WGC3Dint,
1035 const WGC3Dfloat *) 1036 const WGC3Dfloat *)
1036 DELEGATE_TO_GL_3(clearBufferiv, ClearBufferiv, WGC3Denum, WGC3Dint, 1037 DELEGATE_TO_GL_3(clearBufferiv, ClearBufferiv, WGC3Denum, WGC3Dint,
1037 const WGC3Dint *) 1038 const WGC3Dint *)
1038 DELEGATE_TO_GL_3(clearBufferuiv, ClearBufferuiv, WGC3Denum, WGC3Dint, 1039 DELEGATE_TO_GL_3(clearBufferuiv, ClearBufferuiv, WGC3Denum, WGC3Dint,
1039 const WGC3Duint *) 1040 const WGC3Duint *)
1040 //DELEGATE_TO_GL_3R(clientWaitSync, ClientWaitSync, WebGLId, WGC3Dbitfield, 1041 WGC3Denum WebGraphicsContext3DImpl::clientWaitSync(WGC3Dsync sync,
1041 // WGC3Duint64, WGC3Denum) 1042 WGC3Dbitfield flags,
1043 WGC3Duint64 timeout) {
1044 return gl_->ClientWaitSync(reinterpret_cast<GLsync>(sync), flags, timeout);
1045 }
1042 //DELEGATE_TO_GL_9(compressedTexImage3D, CompressedTexImage3D, WGC3Denum, 1046 //DELEGATE_TO_GL_9(compressedTexImage3D, CompressedTexImage3D, WGC3Denum,
1043 // WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei, WGC3Dsizei, 1047 // WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei, WGC3Dsizei,
1044 // WGC3Dint, WGC3Dsizei, const void *) 1048 // WGC3Dint, WGC3Dsizei, const void *)
1045 //DELEGATE_TO_GL_11(compressedTexSubImage3D, CompressedTexSubImage3D, WGC3Denum, 1049 //DELEGATE_TO_GL_11(compressedTexSubImage3D, CompressedTexSubImage3D, WGC3Denum,
1046 // WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, 1050 // WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei,
1047 // WGC3Dsizei, WGC3Dsizei, WGC3Denum, WGC3Dsizei, const void *) 1051 // WGC3Dsizei, WGC3Dsizei, WGC3Denum, WGC3Dsizei, const void *)
1048 DELEGATE_TO_GL_5(copyBufferSubData, CopyBufferSubData, WGC3Denum, WGC3Denum, 1052 DELEGATE_TO_GL_5(copyBufferSubData, CopyBufferSubData, WGC3Denum, WGC3Denum,
1049 WGC3Dintptr, WGC3Dintptr, WGC3Dsizeiptr) 1053 WGC3Dintptr, WGC3Dintptr, WGC3Dsizeiptr)
1050 DELEGATE_TO_GL_9(copyTexSubImage3D, CopyTexSubImage3D, WGC3Denum, WGC3Dint, 1054 DELEGATE_TO_GL_9(copyTexSubImage3D, CopyTexSubImage3D, WGC3Denum, WGC3Dint,
1051 WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, 1055 WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei,
1052 WGC3Dsizei) 1056 WGC3Dsizei)
1053 WebGLId WebGraphicsContext3DImpl::createSampler() { 1057 WebGLId WebGraphicsContext3DImpl::createSampler() {
1054 GLuint sampler; 1058 GLuint sampler;
1055 gl_->GenSamplers(1, &sampler); 1059 gl_->GenSamplers(1, &sampler);
1056 return sampler; 1060 return sampler;
1057 } 1061 }
1058 WebGLId WebGraphicsContext3DImpl::createTransformFeedback() { 1062 WebGLId WebGraphicsContext3DImpl::createTransformFeedback() {
1059 GLuint tf; 1063 GLuint tf;
1060 gl_->GenTransformFeedbacks(1, &tf); 1064 gl_->GenTransformFeedbacks(1, &tf);
1061 return tf; 1065 return tf;
1062 } 1066 }
1063 void WebGraphicsContext3DImpl::deleteSampler(WebGLId sampler) { 1067 void WebGraphicsContext3DImpl::deleteSampler(WebGLId sampler) {
1064 gl_->DeleteSamplers(1, &sampler); 1068 gl_->DeleteSamplers(1, &sampler);
1065 } 1069 }
1066 //DELEGATE_TO_GL_1(deleteSync, DeleteSync, WebGLId) 1070 void WebGraphicsContext3DImpl::deleteSync(WGC3Dsync sync) {
1071 gl_->DeleteSync(reinterpret_cast<GLsync>(sync));
1072 }
1067 void WebGraphicsContext3DImpl::deleteTransformFeedback(WebGLId tf) { 1073 void WebGraphicsContext3DImpl::deleteTransformFeedback(WebGLId tf) {
1068 gl_->DeleteTransformFeedbacks(1, &tf); 1074 gl_->DeleteTransformFeedbacks(1, &tf);
1069 } 1075 }
1076 void WebGraphicsContext3DImpl::drawRangeElements(
1077 WGC3Denum mode, WGC3Duint start, WGC3Duint end, WGC3Dsizei count,
1078 WGC3Denum type, WGC3Dintptr offset) {
1079 gl_->DrawRangeElements(mode, start, end, count, type,
1080 reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
1081 }
1070 DELEGATE_TO_GL(endTransformFeedback, EndTransformFeedback) 1082 DELEGATE_TO_GL(endTransformFeedback, EndTransformFeedback)
1071 //DELEGATE_TO_GL_2R(fenceSync, FenceSync, WGC3Denum, WGC3Dbitfield, WebGLId) 1083 WGC3Dsync WebGraphicsContext3DImpl::fenceSync(WGC3Denum condition,
1084 WGC3Dbitfield flags) {
1085 return reinterpret_cast<WGC3Dsync>(gl_->FenceSync(condition, flags));
1086 }
1072 DELEGATE_TO_GL_5(framebufferTextureLayer, FramebufferTextureLayer, WGC3Denum, 1087 DELEGATE_TO_GL_5(framebufferTextureLayer, FramebufferTextureLayer, WGC3Denum,
1073 WGC3Denum, WGC3Duint, WGC3Dint, WGC3Dint) 1088 WGC3Denum, WGC3Duint, WGC3Dint, WGC3Dint)
1074 DELEGATE_TO_GL_5(getActiveUniformBlockName, GetActiveUniformBlockName, 1089 DELEGATE_TO_GL_5(getActiveUniformBlockName, GetActiveUniformBlockName,
1075 WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dchar *) 1090 WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dchar *)
1076 DELEGATE_TO_GL_4(getActiveUniformBlockiv, GetActiveUniformBlockiv, WGC3Duint, 1091 DELEGATE_TO_GL_4(getActiveUniformBlockiv, GetActiveUniformBlockiv, WGC3Duint,
1077 WGC3Duint, WGC3Denum, WGC3Dint *) 1092 WGC3Duint, WGC3Denum, WGC3Dint *)
1078 //DELEGATE_TO_GL_5(getActiveUniformsiv, GetActiveUniformsiv, WGC3Duint, 1093 DELEGATE_TO_GL_5(getActiveUniformsiv, GetActiveUniformsiv, WGC3Duint,
1079 // WGC3Dsizei, const WGC3Duint *, WGC3Denum, WGC3Dint *) 1094 WGC3Dsizei, const WGC3Duint *, WGC3Denum, WGC3Dint *)
1080 DELEGATE_TO_GL_2R(getFragDataLocation, GetFragDataLocation, WGC3Duint, 1095 DELEGATE_TO_GL_2R(getFragDataLocation, GetFragDataLocation, WGC3Duint,
1081 const WGC3Dchar *, WGC3Dint) 1096 const WGC3Dchar *, WGC3Dint)
1082 DELEGATE_TO_GL_5(getInternalformativ, GetInternalformativ, WGC3Denum, WGC3Denum, 1097 DELEGATE_TO_GL_5(getInternalformativ, GetInternalformativ, WGC3Denum, WGC3Denum,
1083 WGC3Denum, WGC3Dsizei, WGC3Dint *) 1098 WGC3Denum, WGC3Dsizei, WGC3Dint *)
1084 DELEGATE_TO_GL_3(getSamplerParameterfv, GetSamplerParameterfv, WGC3Duint, 1099 DELEGATE_TO_GL_3(getSamplerParameterfv, GetSamplerParameterfv, WGC3Duint,
1085 WGC3Denum, WGC3Dfloat *) 1100 WGC3Denum, WGC3Dfloat *)
1086 DELEGATE_TO_GL_3(getSamplerParameteriv, GetSamplerParameteriv, WGC3Duint, 1101 DELEGATE_TO_GL_3(getSamplerParameteriv, GetSamplerParameteriv, WGC3Duint,
1087 WGC3Denum, WGC3Dint *) 1102 WGC3Denum, WGC3Dint *)
1088 //DELEGATE_TO_GL_7(getTransformFeedbackVarying, GetTransformFeedbackVarying, 1103 DELEGATE_TO_GL_7(getTransformFeedbackVarying, GetTransformFeedbackVarying,
1089 // WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dsizei *, 1104 WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dsizei *,
1090 // WGC3Denum *, WGC3Dchar *) 1105 WGC3Denum *, WGC3Dchar *)
1091 DELEGATE_TO_GL_2R(getUniformBlockIndex, GetUniformBlockIndex, WGC3Duint, 1106 DELEGATE_TO_GL_2R(getUniformBlockIndex, GetUniformBlockIndex, WGC3Duint,
1092 const WGC3Dchar *, WGC3Duint) 1107 const WGC3Dchar *, WGC3Duint)
1093 //DELEGATE_TO_GL_4(getUniformIndices, GetUniformIndices, WGC3Duint, WGC3Dsizei, 1108 DELEGATE_TO_GL_4(getUniformIndices, GetUniformIndices, WGC3Duint, WGC3Dsizei,
1094 // const WGC3Dchar *const*, WGC3Duint *) 1109 const WGC3Dchar *const*, WGC3Duint *)
1095 //DELEGATE_TO_GL_3(getUniformuiv, GetUniformuiv, WGC3Duint, WGC3Dint, 1110 //DELEGATE_TO_GL_3(getUniformuiv, GetUniformuiv, WGC3Duint, WGC3Dint,
1096 // WGC3Duint *) 1111 // WGC3Duint *)
1097 //DELEGATE_TO_GL_3(getVertexAttribIiv, GetVertexAttribIiv, WGC3Duint, 1112 //DELEGATE_TO_GL_3(getVertexAttribIiv, GetVertexAttribIiv, WGC3Duint,
1098 // WGC3Denum, WGC3Dint *) 1113 // WGC3Denum, WGC3Dint *)
1099 //DELEGATE_TO_GL_3(getVertexAttribIuiv, GetVertexAttribIuiv, WGC3Duint, 1114 //DELEGATE_TO_GL_3(getVertexAttribIuiv, GetVertexAttribIuiv, WGC3Duint,
1100 // WGC3Denum, WGC3Duint *) 1115 // WGC3Denum, WGC3Duint *)
1101 DELEGATE_TO_GL_3(invalidateFramebuffer, InvalidateFramebuffer, WGC3Denum, 1116 DELEGATE_TO_GL_3(invalidateFramebuffer, InvalidateFramebuffer, WGC3Denum,
1102 WGC3Dsizei, const WGC3Denum *) 1117 WGC3Dsizei, const WGC3Denum *)
1103 DELEGATE_TO_GL_7(invalidateSubFramebuffer, InvalidateSubFramebuffer, WGC3Denum, 1118 DELEGATE_TO_GL_7(invalidateSubFramebuffer, InvalidateSubFramebuffer, WGC3Denum,
1104 WGC3Dsizei, const WGC3Denum *, WGC3Dint, WGC3Dint, WGC3Dsizei, 1119 WGC3Dsizei, const WGC3Denum *, WGC3Dint, WGC3Dint, WGC3Dsizei,
1105 WGC3Dsizei) 1120 WGC3Dsizei)
1106 DELEGATE_TO_GL_1R(isSampler, IsSampler, WebGLId, WGC3Dboolean) 1121 DELEGATE_TO_GL_1R(isSampler, IsSampler, WebGLId, WGC3Dboolean)
1107 //DELEGATE_TO_GL_1R(isSync, IsSync, WebGLId, WGC3Dboolean) 1122 WGC3Dboolean WebGraphicsContext3DImpl::isSync(WGC3Dsync sync) {
1123 return gl_->IsSync(reinterpret_cast<GLsync>(sync));
1124 }
1108 DELEGATE_TO_GL_1R(isTransformFeedback, IsTransformFeedback, WGC3Duint, 1125 DELEGATE_TO_GL_1R(isTransformFeedback, IsTransformFeedback, WGC3Duint,
1109 WGC3Dboolean) 1126 WGC3Dboolean)
1110 DELEGATE_TO_GL(pauseTransformFeedback, PauseTransformFeedback) 1127 DELEGATE_TO_GL(pauseTransformFeedback, PauseTransformFeedback)
1111 //DELEGATE_TO_GL_3(programParameteri, ProgramParameteri, WGC3Duint, WGC3Denum, 1128 //DELEGATE_TO_GL_3(programParameteri, ProgramParameteri, WGC3Duint, WGC3Denum,
1112 // WGC3Dint) 1129 // WGC3Dint)
1113 DELEGATE_TO_GL_1(readBuffer, ReadBuffer, WGC3Denum) 1130 DELEGATE_TO_GL_1(readBuffer, ReadBuffer, WGC3Denum)
1114 DELEGATE_TO_GL(resumeTransformFeedback, ResumeTransformFeedback) 1131 DELEGATE_TO_GL(resumeTransformFeedback, ResumeTransformFeedback)
1115 DELEGATE_TO_GL_3(samplerParameterf, SamplerParameterf, WGC3Duint, WGC3Denum, 1132 DELEGATE_TO_GL_3(samplerParameterf, SamplerParameterf, WGC3Duint, WGC3Denum,
1116 WGC3Dfloat) 1133 WGC3Dfloat)
1117 DELEGATE_TO_GL_3(samplerParameterfv, SamplerParameterfv, WGC3Duint, WGC3Denum, 1134 DELEGATE_TO_GL_3(samplerParameterfv, SamplerParameterfv, WGC3Duint, WGC3Denum,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1166 WGC3Duint, WGC3Duint, WGC3Duint) 1183 WGC3Duint, WGC3Duint, WGC3Duint)
1167 DELEGATE_TO_GL_2(vertexAttribI4uiv, VertexAttribI4uiv, WGC3Duint, 1184 DELEGATE_TO_GL_2(vertexAttribI4uiv, VertexAttribI4uiv, WGC3Duint,
1168 const WGC3Duint *) 1185 const WGC3Duint *)
1169 void WebGraphicsContext3DImpl::vertexAttribIPointer( 1186 void WebGraphicsContext3DImpl::vertexAttribIPointer(
1170 WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dsizei stride, 1187 WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dsizei stride,
1171 WGC3Dintptr offset) { 1188 WGC3Dintptr offset) {
1172 gl_->VertexAttribIPointer( 1189 gl_->VertexAttribIPointer(
1173 index, size, type, stride, 1190 index, size, type, stride,
1174 reinterpret_cast<void*>(static_cast<intptr_t>(offset))); 1191 reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
1175 } 1192 }
1176 //DELEGATE_TO_GL_3(waitSync, WaitSync, WebGLId, WGC3Dbitfield, WGC3Duint64) 1193 void WebGraphicsContext3DImpl::waitSync(WGC3Dsync sync,
1194 WGC3Dbitfield flags,
1195 WGC3Duint64 timeout) {
1196 gl_->WaitSync(reinterpret_cast<GLsync>(sync), flags, timeout);
1197 }
1177 1198
1178 GrGLInterface* WebGraphicsContext3DImpl::createGrGLInterface() { 1199 GrGLInterface* WebGraphicsContext3DImpl::createGrGLInterface() {
1179 return skia_bindings::CreateCommandBufferSkiaGLBinding(); 1200 return skia_bindings::CreateCommandBufferSkiaGLBinding();
1180 } 1201 }
1181 1202
1182 ::gpu::gles2::GLES2ImplementationErrorMessageCallback* 1203 ::gpu::gles2::GLES2ImplementationErrorMessageCallback*
1183 WebGraphicsContext3DImpl::getErrorMessageCallback() { 1204 WebGraphicsContext3DImpl::getErrorMessageCallback() {
1184 if (!client_error_message_callback_) { 1205 if (!client_error_message_callback_) {
1185 client_error_message_callback_.reset( 1206 client_error_message_callback_.reset(
1186 new WebGraphicsContext3DErrorMessageCallback(this)); 1207 new WebGraphicsContext3DErrorMessageCallback(this));
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1229 output_attribs->samples = attributes.antialias ? 4 : 0; 1250 output_attribs->samples = attributes.antialias ? 4 : 0;
1230 output_attribs->sample_buffers = attributes.antialias ? 1 : 0; 1251 output_attribs->sample_buffers = attributes.antialias ? 1 : 0;
1231 output_attribs->fail_if_major_perf_caveat = 1252 output_attribs->fail_if_major_perf_caveat =
1232 attributes.failIfMajorPerformanceCaveat; 1253 attributes.failIfMajorPerformanceCaveat;
1233 output_attribs->bind_generates_resource = false; 1254 output_attribs->bind_generates_resource = false;
1234 output_attribs->es3_context_required = 1255 output_attribs->es3_context_required =
1235 (attributes.webGL && attributes.webGLVersion == 2); 1256 (attributes.webGL && attributes.webGLVersion == 2);
1236 } 1257 }
1237 1258
1238 } // namespace gpu_blink 1259 } // namespace gpu_blink
OLDNEW
« no previous file with comments | « gpu/blink/webgraphicscontext3d_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698