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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

Issue 2043983002: gpu: Disallow null client ids in Gen* functions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
index 1d28c113f78b3494f4f01512d8a841887e2f28b8..e1a3a68545b09798e9828b3438ba8caf3aacd36d 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -1257,7 +1257,7 @@ error::Error GLES2DecoderImpl::HandleGenBuffersImmediate(
if (buffers == NULL) {
return error::kOutOfBounds;
}
- if (!CheckUniqueIds(n, buffers) || !GenBuffersHelper(n, buffers)) {
+ if (!CheckUniqueAndNonNullIds(n, buffers) || !GenBuffersHelper(n, buffers)) {
return error::kInvalidArguments;
}
return error::kNoError;
@@ -1294,7 +1294,7 @@ error::Error GLES2DecoderImpl::HandleGenFramebuffersImmediate(
if (framebuffers == NULL) {
return error::kOutOfBounds;
}
- if (!CheckUniqueIds(n, framebuffers) ||
+ if (!CheckUniqueAndNonNullIds(n, framebuffers) ||
!GenFramebuffersHelper(n, framebuffers)) {
return error::kInvalidArguments;
}
@@ -1317,7 +1317,7 @@ error::Error GLES2DecoderImpl::HandleGenRenderbuffersImmediate(
if (renderbuffers == NULL) {
return error::kOutOfBounds;
}
- if (!CheckUniqueIds(n, renderbuffers) ||
+ if (!CheckUniqueAndNonNullIds(n, renderbuffers) ||
!GenRenderbuffersHelper(n, renderbuffers)) {
return error::kInvalidArguments;
}
@@ -1342,7 +1342,8 @@ error::Error GLES2DecoderImpl::HandleGenSamplersImmediate(
if (samplers == NULL) {
return error::kOutOfBounds;
}
- if (!CheckUniqueIds(n, samplers) || !GenSamplersHelper(n, samplers)) {
+ if (!CheckUniqueAndNonNullIds(n, samplers) ||
+ !GenSamplersHelper(n, samplers)) {
return error::kInvalidArguments;
}
return error::kNoError;
@@ -1364,7 +1365,8 @@ error::Error GLES2DecoderImpl::HandleGenTexturesImmediate(
if (textures == NULL) {
return error::kOutOfBounds;
}
- if (!CheckUniqueIds(n, textures) || !GenTexturesHelper(n, textures)) {
+ if (!CheckUniqueAndNonNullIds(n, textures) ||
+ !GenTexturesHelper(n, textures)) {
return error::kInvalidArguments;
}
return error::kNoError;
@@ -1388,7 +1390,8 @@ error::Error GLES2DecoderImpl::HandleGenTransformFeedbacksImmediate(
if (ids == NULL) {
return error::kOutOfBounds;
}
- if (!CheckUniqueIds(n, ids) || !GenTransformFeedbacksHelper(n, ids)) {
+ if (!CheckUniqueAndNonNullIds(n, ids) ||
+ !GenTransformFeedbacksHelper(n, ids)) {
return error::kInvalidArguments;
}
return error::kNoError;
@@ -4457,7 +4460,8 @@ error::Error GLES2DecoderImpl::HandleGenQueriesEXTImmediate(
if (queries == NULL) {
return error::kOutOfBounds;
}
- if (!CheckUniqueIds(n, queries) || !GenQueriesEXTHelper(n, queries)) {
+ if (!CheckUniqueAndNonNullIds(n, queries) ||
+ !GenQueriesEXTHelper(n, queries)) {
return error::kInvalidArguments;
}
return error::kNoError;
@@ -4579,7 +4583,8 @@ error::Error GLES2DecoderImpl::HandleGenVertexArraysOESImmediate(
if (arrays == NULL) {
return error::kOutOfBounds;
}
- if (!CheckUniqueIds(n, arrays) || !GenVertexArraysOESHelper(n, arrays)) {
+ if (!CheckUniqueAndNonNullIds(n, arrays) ||
+ !GenVertexArraysOESHelper(n, arrays)) {
return error::kInvalidArguments;
}
return error::kNoError;
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698