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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/ipc/service/gpu_channel_unittest.cc

Issue 2881813002: Revert of gpu: GPU service scheduler. (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « gpu/ipc/service/gpu_channel_test_common.cc ('k') | gpu/ipc/service/gpu_command_buffer_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/gpu_channel_unittest.cc
diff --git a/gpu/ipc/service/gpu_channel_unittest.cc b/gpu/ipc/service/gpu_channel_unittest.cc
index 286124a69aa003f7d6c4f12895512dbd14e26a43..e76f2dbf44766dd68413cb14c7dd694f0aaf98ce 100644
--- a/gpu/ipc/service/gpu_channel_unittest.cc
+++ b/gpu/ipc/service/gpu_channel_unittest.cc
@@ -32,7 +32,7 @@
init_params.surface_handle = surface_handle;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = 0;
- init_params.stream_priority = SchedulingPriority::kNormal;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = gles2::ContextCreationAttribHelper();
init_params.active_url = GURL();
bool result = false;
@@ -60,7 +60,7 @@
init_params.surface_handle = surface_handle;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = 0;
- init_params.stream_priority = SchedulingPriority::kNormal;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = gles2::ContextCreationAttribHelper();
init_params.active_url = GURL();
bool result = false;
@@ -84,7 +84,7 @@
init_params.surface_handle = kNullSurfaceHandle;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = 0;
- init_params.stream_priority = SchedulingPriority::kNormal;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = gles2::ContextCreationAttribHelper();
init_params.active_url = GURL();
bool result = false;
@@ -110,7 +110,7 @@
init_params.surface_handle = kNullSurfaceHandle;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = kStreamId1;
- init_params.stream_priority = SchedulingPriority::kNormal;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = gles2::ContextCreationAttribHelper();
init_params.active_url = GURL();
bool result = false;
@@ -129,7 +129,7 @@
init_params.share_group_id = kRouteId1;
init_params.stream_id = kStreamId2;
- init_params.stream_priority = SchedulingPriority::kNormal;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = gles2::ContextCreationAttribHelper();
init_params.active_url = GURL();
HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
@@ -141,20 +141,21 @@
EXPECT_FALSE(stub);
}
-TEST_F(GpuChannelTest, HighPriorityStreamsDisallowed) {
+TEST_F(GpuChannelTest, RealTimeStreamsDisallowed) {
int32_t kClientId = 1;
bool is_gpu_host = false;
GpuChannel* channel = CreateChannel(kClientId, is_gpu_host);
ASSERT_TRUE(channel);
- // Highest priority is disallowed.
+ // Create first context.
int32_t kRouteId = 1;
int32_t kStreamId = 1;
+ GpuStreamPriority kStreamPriority = GpuStreamPriority::REAL_TIME;
GPUCreateCommandBufferConfig init_params;
init_params.surface_handle = kNullSurfaceHandle;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = kStreamId;
- init_params.stream_priority = SchedulingPriority::kHighest;
+ init_params.stream_priority = kStreamPriority;
init_params.attribs = gles2::ContextCreationAttribHelper();
init_params.active_url = GURL();
bool result = false;
@@ -163,50 +164,37 @@
init_params, kRouteId, GetSharedHandle(), &result,
&capabilities));
EXPECT_FALSE(result);
- EXPECT_FALSE(channel->LookupCommandBuffer(kRouteId));
-
- // High priority is also disallowed.
- init_params.stream_priority = SchedulingPriority::kHigh;
- HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
- init_params, kRouteId, GetSharedHandle(), &result,
- &capabilities));
- EXPECT_FALSE(result);
- EXPECT_FALSE(channel->LookupCommandBuffer(kRouteId));
-}
-
-TEST_F(GpuChannelTest, HighPriorityStreamsAllowed) {
+
+ GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId);
+ EXPECT_FALSE(stub);
+}
+
+TEST_F(GpuChannelTest, RealTimeStreamsAllowed) {
int32_t kClientId = 1;
bool is_gpu_host = true;
GpuChannel* channel = CreateChannel(kClientId, is_gpu_host);
ASSERT_TRUE(channel);
- // Highest priority is allowed.
- int32_t kRouteId1 = 1;
- GPUCreateCommandBufferConfig init_params;
- init_params.surface_handle = kNullSurfaceHandle;
- init_params.share_group_id = MSG_ROUTING_NONE;
- init_params.stream_id = 1;
- init_params.stream_priority = SchedulingPriority::kHighest;
- init_params.attribs = gles2::ContextCreationAttribHelper();
- init_params.active_url = GURL();
- bool result = false;
- gpu::Capabilities capabilities;
- HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
- init_params, kRouteId1, GetSharedHandle(), &result,
- &capabilities));
- EXPECT_TRUE(result);
- EXPECT_TRUE(channel->LookupCommandBuffer(kRouteId1));
-
- // High priority is also allowed.
- int32_t kRouteId2 = 2;
- init_params.stream_id = 2;
- init_params.stream_priority = SchedulingPriority::kHigh;
- result = false;
- HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
- init_params, kRouteId2, GetSharedHandle(), &result,
- &capabilities));
- EXPECT_TRUE(result);
- EXPECT_TRUE(channel->LookupCommandBuffer(kRouteId2));
+ // Create first context.
+ int32_t kRouteId = 1;
+ int32_t kStreamId = 1;
+ GpuStreamPriority kStreamPriority = GpuStreamPriority::REAL_TIME;
+ GPUCreateCommandBufferConfig init_params;
+ init_params.surface_handle = kNullSurfaceHandle;
+ init_params.share_group_id = MSG_ROUTING_NONE;
+ init_params.stream_id = kStreamId;
+ init_params.stream_priority = kStreamPriority;
+ init_params.attribs = gles2::ContextCreationAttribHelper();
+ init_params.active_url = GURL();
+ bool result = false;
+ gpu::Capabilities capabilities;
+ HandleMessage(channel, new GpuChannelMsg_CreateCommandBuffer(
+ init_params, kRouteId, GetSharedHandle(), &result,
+ &capabilities));
+ EXPECT_TRUE(result);
+
+ GpuCommandBufferStub* stub = channel->LookupCommandBuffer(kRouteId);
+ EXPECT_TRUE(stub);
}
TEST_F(GpuChannelTest, CreateFailsIfSharedContextIsLost) {
@@ -222,7 +210,7 @@
init_params.surface_handle = kNullSurfaceHandle;
init_params.share_group_id = MSG_ROUTING_NONE;
init_params.stream_id = 0;
- init_params.stream_priority = SchedulingPriority::kNormal;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = gles2::ContextCreationAttribHelper();
init_params.active_url = GURL();
bool result = false;
@@ -242,7 +230,7 @@
init_params.surface_handle = kNullSurfaceHandle;
init_params.share_group_id = kSharedRouteId;
init_params.stream_id = 0;
- init_params.stream_priority = SchedulingPriority::kNormal;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = gles2::ContextCreationAttribHelper();
init_params.active_url = GURL();
bool result = false;
@@ -266,7 +254,7 @@
init_params.surface_handle = kNullSurfaceHandle;
init_params.share_group_id = kSharedRouteId;
init_params.stream_id = 0;
- init_params.stream_priority = SchedulingPriority::kNormal;
+ init_params.stream_priority = GpuStreamPriority::NORMAL;
init_params.attribs = gles2::ContextCreationAttribHelper();
init_params.active_url = GURL();
bool result = false;
« no previous file with comments | « gpu/ipc/service/gpu_channel_test_common.cc ('k') | gpu/ipc/service/gpu_command_buffer_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698